r51156 - in /attic/libgksu/debian: changelog patches/24_cross.patch patches/series

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Sun Sep 25 13:02:53 UTC 2016


Author: rbalint
Date: Sun Sep 25 13:02:49 2016
New Revision: 51156

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51156
Log:
Fix FTCBFS: Add 24_cross.patch

Added:
    attic/libgksu/debian/patches/24_cross.patch
Modified:
    attic/libgksu/debian/changelog
    attic/libgksu/debian/patches/series

Modified: attic/libgksu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgksu/debian/changelog?rev=51156&op=diff
==============================================================================
--- attic/libgksu/debian/changelog	[utf-8] (original)
+++ attic/libgksu/debian/changelog	[utf-8] Sun Sep 25 13:02:49 2016
@@ -1,9 +1,12 @@
-libgksu (2.0.13~pre1-9) UNRELEASED; urgency=medium
+libgksu (2.0.13~pre1-10) UNRELEASED; urgency=medium
 
   * Pass configure flags properly
   * Set gksu-run-helper's location using configure instead of moving it later
 
- -- Balint Reczey <balint at balintreczey.hu>  Sun, 07 Sep 2014 11:08:58 +0200
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Add 24_cross.patch (Closes: #837605)
+
+ -- Balint Reczey <balint at balintreczey.hu>  Sun, 25 Sep 2016 14:47:11 +0200
 
 libgksu (2.0.13~pre1-8) unstable; urgency=medium
 

Added: attic/libgksu/debian/patches/24_cross.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgksu/debian/patches/24_cross.patch?rev=51156&op=file
==============================================================================
--- attic/libgksu/debian/patches/24_cross.patch	(added)
+++ attic/libgksu/debian/patches/24_cross.patch	[utf-8] Sun Sep 25 13:02:49 2016
@@ -0,0 +1,45 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: fix cross compilation by using the cross tools discovered by configure
+
+Index: libgksu-2.0.13~pre1/libgksuui/Makefile.am
+===================================================================
+--- libgksu-2.0.13~pre1.orig/libgksuui/Makefile.am
++++ libgksu-2.0.13~pre1/libgksuui/Makefile.am
+@@ -1,10 +1,10 @@
+ AM_CFLAGS = -g -O2 -Wall
+-INCLUDES = `pkg-config --cflags gtk+-2.0 gconf-2.0`
++INCLUDES = `$(PKG_CONFIG) --cflags gtk+-2.0 gconf-2.0`
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+ 
+ noinst_LTLIBRARIES = libgksuui1.0.la
+ libgksuui1_0_la_SOURCES = gksuui-dialog.c
+-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0 x11`
++libgksuui1_0_la_LDFLAGS = -Wl,-O1 `$(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0 x11`
+ 
+ noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ includedir = ${prefix}/include/$(PACKAGE)
+@@ -12,4 +12,4 @@
+ noinst_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = libgksuui1.0.la
+-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 x11`
++test_gksuui_LDFLAGS = `$(PKG_CONFIG) --libs glib-2.0 x11`
+Index: libgksu-2.0.13~pre1/libgksu/Makefile.am
+===================================================================
+--- libgksu-2.0.13~pre1.orig/libgksu/Makefile.am
++++ libgksu-2.0.13~pre1/libgksu/Makefile.am
+@@ -28,12 +28,12 @@
+ 
+ pkglibdir = ${libdir}/${PACKAGE}
+ pkglibexec_PROGRAMS = gksu-run-helper
+-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
++gksu_run_helper_LDFLAGS = `$(PKG_CONFIG) --libs glib-2.0`
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ 
+ noinst_PROGRAMS = test-gksu
+ test_gksu_SOURCES = test-gksu.c
+ test_gksu_LDADD = libgksu2.la
+-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gtk+-2.0`
++test_gksu_LDFLAGS = `$(PKG_CONFIG) --libs glib-2.0 gtk+-2.0`
+ 
+ EXTRA_DIST = libgksu.ver

Modified: attic/libgksu/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgksu/debian/patches/series?rev=51156&op=diff
==============================================================================
--- attic/libgksu/debian/patches/series	[utf-8] (original)
+++ attic/libgksu/debian/patches/series	[utf-8] Sun Sep 25 13:02:49 2016
@@ -5,4 +5,5 @@
 05_ja.patch
 06_unguarded_child_stderr.patch
 23_correct_colormap_get.patch
+24_cross.patch
 99_intltool.patch




More information about the pkg-gnome-commits mailing list