[Pkg-xfce-commits] r5026 - in goodies/branches/experimental/ristretto/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-02-22 19:33:46 +0000 (Tue, 22 Feb 2011)
New Revision: 5026

Added:
   goodies/branches/experimental/ristretto/debian/patches/01_fix-implicit-dso-linking.patch
   goodies/branches/experimental/ristretto/debian/patches/series
Modified:
   goodies/branches/experimental/ristretto/debian/changelog
Log:
* debian/patches:
  - 01_fix-implicit-dso-linking.patch: fix build with --no-add-needed
    (backported from upstream git).
  - series: add this patch.

Modified: goodies/branches/experimental/ristretto/debian/changelog
===================================================================
--- goodies/branches/experimental/ristretto/debian/changelog	2011-02-22 06:42:07 UTC (rev 5025)
+++ goodies/branches/experimental/ristretto/debian/changelog	2011-02-22 19:33:46 UTC (rev 5026)
@@ -1,3 +1,12 @@
+ristretto (0.0.91-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_fix-implicit-dso-linking.patch: fix build with --no-add-needed
+      (backported from upstream git).
+    - series: add this patch.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Tue, 22 Feb 2011 20:30:36 +0100
+
 ristretto (0.0.91-1) experimental; urgency=low
 
   [ Lionel Le Folgoc ]

Added: goodies/branches/experimental/ristretto/debian/patches/01_fix-implicit-dso-linking.patch
===================================================================
--- goodies/branches/experimental/ristretto/debian/patches/01_fix-implicit-dso-linking.patch	                        (rev 0)
+++ goodies/branches/experimental/ristretto/debian/patches/01_fix-implicit-dso-linking.patch	2011-02-22 19:33:46 UTC (rev 5026)
@@ -0,0 +1,33 @@
+From 646e66be08ff98162890de9ed184393f4be6bd13 Mon Sep 17 00:00:00 2001
+From: Stephan Arts <stephan at xfce.org>
+Date: Tue, 13 Jul 2010 16:58:44 +0000
+Subject: Fix build with --no-add-needed
+
+Add -lX11 to LDADD in Makefile.am
+---
+The upstream patch as been slightly changed/cleaned:
+  * dropped changes to Changelog;
+  * added changes to Makefile.in to avoid rerunning autotools.
+
+--- ristretto-0.0.91.orig/src/Makefile.in
++++ ristretto-0.0.91/src/Makefile.in
+@@ -278,7 +278,7 @@ ristretto_LDADD = \
+ 	$(CAIRO_LIBS) \
+ 	$(XFCONF_LIBS) \
+ 	$(LIBXFCE4UTIL_LIBS) \
+-	$(LIBXFCEGUI4_LIBS)
++	$(LIBXFCEGUI4_LIBS) -lX11
+ 
+ INCLUDES = \
+ 	-I${top_srcdir}
+--- ristretto-0.0.91.orig/src/Makefile.am
++++ ristretto-0.0.91/src/Makefile.am
+@@ -41,7 +41,7 @@ ristretto_LDADD = \
+ 	$(CAIRO_LIBS) \
+ 	$(XFCONF_LIBS) \
+ 	$(LIBXFCE4UTIL_LIBS) \
+-	$(LIBXFCEGUI4_LIBS)
++	$(LIBXFCEGUI4_LIBS) -lX11
+ 
+ INCLUDES = \
+ 	-I${top_srcdir}

Added: goodies/branches/experimental/ristretto/debian/patches/series
===================================================================
--- goodies/branches/experimental/ristretto/debian/patches/series	                        (rev 0)
+++ goodies/branches/experimental/ristretto/debian/patches/series	2011-02-22 19:33:46 UTC (rev 5026)
@@ -0,0 +1 @@
+01_fix-implicit-dso-linking.patch