[med-svn] [praat] 04/07: d/p/pangocairo-pkg-config.patch: Drop patch (applied upstream)

[Rafael Laboissiere]

This is an automated email from the git hooks/post-receive script.

rafael pushed a commit to branch master
in repository praat.

commit 31366f578d70a2d8263da014d1fbab4a345da8bc
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Thu Aug 24 10:22:09 2017 -0300

    d/p/pangocairo-pkg-config.patch: Drop patch (applied upstream)
---
 debian/patches/pangocairo-pkg-config.patch | 33 ------------------------------
 debian/patches/series                      |  1 -
 2 files changed, 34 deletions(-)

diff --git a/debian/patches/pangocairo-pkg-config.patch b/debian/patches/pangocairo-pkg-config.patch
deleted file mode 100644
index 67dcfb4..0000000
--- a/debian/patches/pangocairo-pkg-config.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 <bunk at debian.org>
-Bug-Debian: http://bugs.debian.org/871907
-Forwarded: https://github.com/praat/praat/pull/417
-Reviewed-by: Rafael Laboissiere <rafael at debian.org>
-Last-Update: 2017-07-12
-
---- praat-6.0.30.orig/makefiles/makefile.defs.linux.nogui
-+++ praat-6.0.30/makefiles/makefile.defs.linux.nogui
-@@ -7,7 +7,7 @@ CC = gcc -std=gnu99
- 
- 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 pangocairo` -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
- 
- CXXFLAGS = $(CFLAGS) -Wshadow
- 
-@@ -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 pangocairo` -lm -lpthread
- 
- AR = ar
- RANLIB = ls
- ICON =
- MAIN_ICON =
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7ea2b0f..4b102bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use-ldflags.patch
 remove-time-date-macros.patch
-pangocairo-pkg-config.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/praat.git