diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
| commit | 01dfa0016c313f5ec5be0a8b624bac5031ff74a8 (patch) | |
| tree | 6dfcf9c3c4143226d0ef65ce2d139f80f8fcacc1 /extra/pulseaudio/version-number.patch | |
| parent | 40e1222c1402c0d2aded73b95802f8197d0691a6 (diff) | |
| parent | 9343f37ee7ba1aa98f65272412d331a280890e12 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/epdfview/PKGBUILD
community/gpa/PKGBUILD
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/lmctl/PKGBUILD
community/mediatomb/PKGBUILD
community/ruby-atk/PKGBUILD
community/ruby-gdkpixbuf2/PKGBUILD
community/ruby-gio2/PKGBUILD
community/ruby-glib2/PKGBUILD
community/ruby-pango/PKGBUILD
core/eglibc/glibc-2.10-bz4781.patch
core/eglibc/glibc-2.10-dont-build-timezone.patch
core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch
core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
core/eglibc/glibc-2.13-futex.patch
core/eglibc/glibc-__i686.patch
extra/silc-toolkit/PKGBUILD
Diffstat (limited to 'extra/pulseaudio/version-number.patch')
| -rw-r--r-- | extra/pulseaudio/version-number.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/extra/pulseaudio/version-number.patch b/extra/pulseaudio/version-number.patch deleted file mode 100644 index 473b252a9..000000000 --- a/extra/pulseaudio/version-number.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c -Author: Colin Guthrie <colin@mageia.org> -Date: Sat Oct 1 12:03:44 2011 +0100 - - libpulse: Always return a three part version number in API calls. - - For both the headers and the library we should provide clean, three part - strings as this has been what we've previously done in the past - and some external systems apparently rely on this format. While it's not - something we've officially commented on before, there is no real advantage - to us to change it so let's not try to tidy things up too much - considering some third party apps (e.g. Skype) seem to dislike a two - part version string. - -diff --git a/src/pulse/context.c b/src/pulse/context.c -index 25d04a1..af144aa 100644 ---- a/src/pulse/context.c -+++ b/src/pulse/context.c -@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su - } - - const char* pa_get_library_version(void) { -- return PACKAGE_VERSION; -+ return pa_get_headers_version(); - } - - const char* pa_context_get_server(pa_context *c) { -diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in -index 7e00c5e..1be4c75 100644 ---- a/src/pulse/version.h.in -+++ b/src/pulse/version.h.in -@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN - /** Return the version of the header files. Keep in mind that this is - a macro and not a function, so it is impossible to get the pointer of - it. */ --#define pa_get_headers_version() ("@PACKAGE_VERSION@") -+#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0") - - /** Return the version of the library the current application is - * linked to. */ |