Opened at 2013-08-19T03:24:16Z
Closed at 2014-06-26T23:20:42Z
#1085 closed defect (fixed)
Configuration patches for pkgconfig file
| Reported by: | jgeboski | Owned by: | |
|---|---|---|---|
| Priority: | normal | Milestone: | |
| Component: | BitlBee | Version: | 3.2 |
| Keywords: | configure plugindir version pkg-config patch | Cc: | |
| IRC client+version: | Client-independent | Operating System: | Linux |
| OS version/distro: |
Description
Currently, BitlBee neglects to setup the pkgconfig file correctly. The first issue is the version string contained within bitlbee.pc. By default, without explicitly defining BITLBEE_VERSION, and configuring outside of a bazaar branch, the version string is empty. Additionally, if configured within a bazaar branch, the bzr prefixed version makes it impossible for pkg-config to compare against.
The second issue with bitlbee.pc is the missing plugindir variable. This is used by external plugins to figure out where to install to. It is far more sane than parsing bitlbee/config.h for the value of PLUGINDIR.
I have attached two patches, one for each issue described above.
Attachments (3)
Change History (9)
Changed at 2013-08-19T03:25:28Z by
| Attachment: | pkgconfig-version-fix.patch added |
|---|
Changed at 2013-08-19T03:25:58Z by
| Attachment: | pkgconfig-plugindir-fix.patch added |
|---|
Plugindir fix for bitlbee.pc.
comment:1 Changed at 2014-02-04T04:44:11Z by
| Keywords: | patch added |
|---|
comment:2 Changed at 2014-02-04T04:44:35Z by
| Keywords: | pkgconfig removed |
|---|
Changed at 2014-02-28T00:42:32Z by
| Attachment: | pkgconfig-version-fix-dx.patch added |
|---|
My version of the version fix patch
comment:3 Changed at 2014-02-28T00:51:08Z by
Did some changes to jgeboski's version fix patch. (The plugindir patch is already in the sure-why-not branch)
First, the "-wm1" parameters to grep weren't listed in the grep manpage as defined by posix, so I just used a basic regexp instead. Didn't actually bother testing this in weird unices. Sorry if this just seems like being picky.
Second, kept the feature of spoofing the version via environment variables. I actually use that for my own builds. I'm saving the version grep'd from bitlbee.h in REAL_BITLBEE_VERSION so it can be used for the bzr version number, or as a fallback that pkg-config can use if nothing was specified.
The only not-completely-trivial change remaining about this patch is that bzr version numbers will be "bitlbee-3.2.1-bzr-1011" instead of just "bzr-1011". Wilmer opinion requested.
comment:4 Changed at 2014-02-28T09:44:42Z by
Fine with me, yes. That's consistent with what I'm doing in Debian now.
Only potential problem is that the Debian version would then become 3.2.1+20140228+3.2.1-bzr-1011 or something. But I think with the way the scripts work, that shouldn't happen.
comment:5 Changed at 2014-03-01T02:17:21Z by
Applied plugindir patch in r1012, the other one got excluded from the branch 'accidentally'. Maybe the next time.
comment:6 Changed at 2014-06-26T23:20:42Z by
| Resolution: | → fixed |
|---|---|
| Status: | new → closed |
Applied the version patch in r1020
Version fix for bitlbee.pc.