This is an automated email from the git hooks/post-receive script. rafael pushed a commit to branch master in repository praat.
commit 23ba3499b065f00c8e6b2f97a70a69048580eae7 Author: Rafael Laboissiere <[email protected]> Date: Sat Aug 12 14:58:36 2017 -0300 d/p/pangocairo-pkg-config.patch: New patch This patch replaces d/p/use-gtk-pkg-config.patch and provides a better argument for the pkg-config invokation when buiolding praat_nogui. Gbp-Dch: Full Closes: #871907 Thanks: Adrian Bunk for the patch --- ...kg-config.patch => pangocairo-pkg-config.patch} | 22 +++++++++++++++------- debian/patches/series | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/debian/patches/use-gtk-pkg-config.patch b/debian/patches/pangocairo-pkg-config.patch similarity index 50% rename from debian/patches/use-gtk-pkg-config.patch rename to debian/patches/pangocairo-pkg-config.patch index 963c0c6..67dcfb4 100644 --- a/debian/patches/use-gtk-pkg-config.patch +++ b/debian/patches/pangocairo-pkg-config.patch @@ -1,7 +1,12 @@ -Description: Use Gtk's pkg-config for setting CFLAGS and LDFLAGS -Author: Rafael Laboissiere <[email protected]> -Forwarded: https://github.com/praat/praat/pull/416 -Last-Update: 2017-08-12 +Description: Use pkg-config for pangocairo cflags and libs + Use pkg-config instead of hardcoding pangocairo cflags and libs + (gives the proper location instead of x86_64-linux-gnu in the include + search path even on non-amd64). +Author: Adrian Bunk <[email protected]> +Bug-Debian: http://bugs.debian.org/871907 +Forwarded: https://github.com/praat/praat/pull/417 +Reviewed-by: Rafael Laboissiere <[email protected]> +Last-Update: 2017-07-12 --- praat-6.0.30.orig/makefiles/makefile.defs.linux.nogui +++ praat-6.0.30/makefiles/makefile.defs.linux.nogui @@ -10,16 +15,19 @@ Last-Update: 2017-08-12 CXX = g++ -std=c++11 -CFLAGS = -DNO_GUI -DNO_NETWORK -D_FILE_OFFSET_BITS=64 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread -+CFLAGS = -DNO_GUI -DNO_NETWORK -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-2.0` -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread ++CFLAGS = -DNO_GUI -DNO_NETWORK -D_FILE_OFFSET_BITS=64 `pkg-config --cflags pangocairo` -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread CXXFLAGS = $(CFLAGS) -Wshadow -@@ -15,7 +15,7 @@ LINK = g++ +@@ -15,10 +15,10 @@ LINK = g++ EXECUTABLE = praat_nogui -LIBS = -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lm -lpthread -+LIBS = `pkg-config --libs gtk+-2.0` -lm -lpthread ++LIBS = `pkg-config --libs pangocairo` -lm -lpthread AR = ar RANLIB = ls + ICON = + MAIN_ICON = + diff --git a/debian/patches/series b/debian/patches/series index d6fba6e..c9fc9d3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ use-ldflags.patch remove-time-date-macros.patch tensor-h-filename.patch -use-gtk-pkg-config.patch +pangocairo-pkg-config.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/praat.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
