r41852 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-Prevent-an-invalid-CARBON_LIBS-from-appearing-in-the.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Mon Jun 16 09:17:02 2014
New Revision: 41852

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41852
Log:
0001-Prevent-an-invalid-CARBON_LIBS-from-appearing-in-the.patch:
Cherry-pick patch from upstream to fix an invalid "@CARBON_LIBS@" token
appearing in Libs.private in the pcfile. (LP: #1330033)

Added:
    desktop/experimental/glib2.0/debian/patches/0001-Prevent-an-invalid-CARBON_LIBS-from-appearing-in-the.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=41852&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Mon Jun 16 09:17:02 2014
@@ -6,6 +6,11 @@
   [ Emilio Pozuelo Monfort ]
   * Use the default compiler on sparc, since it's already >> 4.7.
     Closes: #751313.
+
+  [ Iain Lane ]
+  * 0001-Prevent-an-invalid-CARBON_LIBS-from-appearing-in-the.patch:
+    Cherry-pick patch from upstream to fix an invalid "@CARBON_LIBS@" token
+    appearing in Libs.private in the pcfile. (LP: #1330033)
 
  -- Andreas Henriksson <andreas at fatal.se>  Thu, 12 Jun 2014 00:07:01 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/0001-Prevent-an-invalid-CARBON_LIBS-from-appearing-in-the.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-Prevent-an-invalid-CARBON_LIBS-from-appearing-in-the.patch?rev=41852&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-Prevent-an-invalid-CARBON_LIBS-from-appearing-in-the.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-Prevent-an-invalid-CARBON_LIBS-from-appearing-in-the.patch	[utf-8] Mon Jun 16 09:17:02 2014
@@ -0,0 +1,30 @@
+From 9f69534030f963183ac5398889630a641a71409b Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Sat, 14 Jun 2014 17:10:17 +0200
+Subject: [PATCH] Prevent an invalid @CARBON_LIBS@ from appearing in the .pc
+ files
+
+Fixes static linking when using the glib pkgconfig file.
+Regression was introduced in commit 8d037c6 (bz #668152)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=731657
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 6ede842..6b6ab55 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -217,6 +217,8 @@ AS_IF([test "x$glib_have_carbon" = "xyes"], [
+   LDFLAGS="$LDFLAGS $CARBON_LIBS"
+ ], [CARBON_LIBS=""])
+ 
++AC_SUBST([CARBON_LIBS])
++
+ AS_IF([test "x$glib_have_cocoa" = "xyes"], [
+   AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
+   COCOA_LIBS="-Wl,-framework,Foundation"
+-- 
+2.0.0
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=41852&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Mon Jun 16 09:17:02 2014
@@ -18,3 +18,4 @@
 81-skip-monitor-test-on-non-linux.patch
 0001-timer-test-use-volatile-for-locals.patch
 skip-broken-timer-test.patch
+0001-Prevent-an-invalid-CARBON_LIBS-from-appearing-in-the.patch