[med-svn] [Git][med-team/acedb][master] Weak attempt to get rid of GTK2 to address bug #967243

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / acedb


Commits:
cfd57532 by Andreas Tille at 2021-12-17T12:32:21+01:00
Weak attempt to get rid of GTK2 to address bug #967243

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/drop_gtk2.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,12 @@
 acedb (4.9.39+dfsg.02-8) UNRELEASED; urgency=medium
 
+  [ Étienne Mollier ]
   * Adjust hardening.patch to inject CPPFLAGS too, plus more LDFLAGS.
   * Refresh no_dotter_and_belvu.patch accordingly.
 
+  [ Andreas Tille ]
+  * Weak attempt to get rid of GTK2 to address bug #967243
+
  -- Étienne Mollier <emollier at debian.org>  Mon, 25 Oct 2021 22:53:22 +0200
 
 acedb (4.9.39+dfsg.02-7) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -7,8 +7,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libreadline-dev,
                libglib2.0-dev,
-               libgtk2.0-dev,
-               libtirpc-dev,
+               libx11-dev,
                pkg-config,
                csh,
                flex,


=====================================
debian/patches/drop_gtk2.patch
=====================================
@@ -0,0 +1,38 @@
+Description: Weak attempt to get rid of GTK2 to address bug #967243 
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 17 Dec 2021 12:19:18 +0100
+
+--- a/wmake/LINUX_4_DEF
++++ b/wmake/LINUX_4_DEF
+@@ -23,12 +23,12 @@ LIBCC = gcc
+ COPT = -g
+ GTKVER = glib-2.0 gtk+-2.0
+ 
+-COMPILER = gcc $(CPPFLAGS) $(COPT) -Wall  -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
++COMPILER = gcc $(COPT) -Wall  -DACEDB4 `pkg-config --cflags glib-2.0` $(CFLAGS)
+ 
+ LINKER = gcc $(COPT)
+ 
+ # The arg to libs-config is used if our private copy not installed.
+-LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` $(LDFLAGS) -lm -lreadline -lX11
++LIBS = -L/usr/X11R6/lib `pkg-config --libs glib-2.0` -lm -lreadline -lX11
+ 
+ ### Linux uses flex to emulate the standard 'lex' program
+ LEX_LIBS = -lfl
+--- a/wmake/LINUX_64_DEF
++++ b/wmake/LINUX_64_DEF
+@@ -23,12 +23,12 @@ LIBCC = gcc
+ COPT = -g
+ GTKVER = glib-2.0 gtk+-2.0
+ 
+-COMPILER = gcc $(COPT) $(CPPFLAGS) -Wall  -DACEDB4 `../w3rdparty/include-config $(GTKVER)` $(CFLAGS)
++COMPILER = gcc $(COPT) -Wall  -DACEDB4 `pkg-config --cflags glib-2.0` $(CFLAGS)
+ 
+ LINKER = gcc $(COPT)
+ 
+ # The arg to libs-config is used if our private copy not installed.
+-LIBS = -L/usr/X11R6/lib `../w3rdparty/libs-config $(GTKVER)` $(LDFLAGS) -lm -lreadline -lX11
++LIBS = -L/usr/X11R6/lib `pkg-config --libs glib-2.0` -lm -lreadline -lX11
+ 
+ ### Linux uses flex to emulate the standard 'lex' program
+ LEX_LIBS = -lfl


=====================================
debian/patches/series
=====================================
@@ -11,3 +11,4 @@ spelling.patch
 no_dotter_and_belvu.patch
 libfl.patch
 glibc2.32.patch
+drop_gtk2.patch



View it on GitLab: https://salsa.debian.org/med-team/acedb/-/commit/cfd57532861517bad753f07506dfc189ee107c4c

-- 
View it on GitLab: https://salsa.debian.org/med-team/acedb/-/commit/cfd57532861517bad753f07506dfc189ee107c4c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211217/bded557a/attachment-0001.htm>