[libgtkdatabox] 05/16: Adapt patches

Andreas Tille tille at debian.org
Wed Oct 19 14:22:25 UTC 2016 

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

tille pushed a commit to branch master
in repository libgtkdatabox.

commit 50efc368846ab444fdead62a485e7921201c0c2e
Author: Andreas Tille <tille at debian.org>
Date:   Wed Oct 19 13:39:06 2016 +0200

    Adapt patches
---
 debian/patches/01_libglage_example.patch   |  9 +++++----
 debian/patches/04_missing_includes.patch   | 12 ++++++------
 debian/patches/05_explicit_link_libm.patch | 27 +++++----------------------
 debian/patches/06_gladeui-2.0.patch        | 20 ++++++++++----------
 4 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/debian/patches/01_libglage_example.patch b/debian/patches/01_libglage_example.patch
index 89e6dbd..25c6761 100644
--- a/debian/patches/01_libglage_example.patch
+++ b/debian/patches/01_libglage_example.patch
@@ -1,8 +1,8 @@
 Description: Enable libglade example to work in any case
 
---- libgtkdatabox.orig/examples/basics_libglade.c
-+++ libgtkdatabox/examples/basics_libglade.c
-@@ -29,19 +29,13 @@
+--- a/examples/basics_libglade.c
++++ b/examples/basics_libglade.c
+@@ -31,20 +31,14 @@
  #include <gtkdatabox_cross_simple.h>
  #include <math.h>
  
@@ -10,6 +10,7 @@ Description: Enable libglade example to work in any case
 -
 -#ifdef USE_LIBGLADE
  #include <glade/glade.h>
+ #include "basics_libglade.h"
 -#endif
  
  #define POINTS 2000
@@ -22,7 +23,7 @@ Description: Enable libglade example to work in any case
  /*----------------------------------------------------------------
   *  databox basics
   *----------------------------------------------------------------*/
-@@ -207,16 +201,3 @@
+@@ -212,16 +206,3 @@ main (gint argc, char *argv[])
  
     return 0;
  }
diff --git a/debian/patches/04_missing_includes.patch b/debian/patches/04_missing_includes.patch
index e8c526f..ed6875b 100644
--- a/debian/patches/04_missing_includes.patch
+++ b/debian/patches/04_missing_includes.patch
@@ -3,8 +3,8 @@ Date: Thu, 1 Sep 2011 13:03:19 UTC
 Bug-Debian: http://bugs.debian.org/640004
 Description: Add missing function prototype definition
 
---- libgtkdatabox.orig/gtk/gtkdatabox_graph.c
-+++ libgtkdatabox/gtk/gtkdatabox_graph.c
+--- a/gtk/gtkdatabox_graph.c
++++ b/gtk/gtkdatabox_graph.c
 @@ -17,6 +17,10 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
@@ -14,10 +14,10 @@ Description: Add missing function prototype definition
 +#include <gdk/gdk.h>
 +
  #include <gtkdatabox_graph.h>
- #include <gtk/gtkstyle.h>
- #include <gtk/gtkgc.h>
---- libgtkdatabox.orig/gtk/gtkdatabox_markers.c
-+++ libgtkdatabox/gtk/gtkdatabox_markers.c
+ #include <gtk/gtk.h>
+ 
+--- a/gtk/gtkdatabox_markers.c
++++ b/gtk/gtkdatabox_markers.c
 @@ -17,6 +17,10 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   */
diff --git a/debian/patches/05_explicit_link_libm.patch b/debian/patches/05_explicit_link_libm.patch
index b210f32..c03dc93 100644
--- a/debian/patches/05_explicit_link_libm.patch
+++ b/debian/patches/05_explicit_link_libm.patch
@@ -7,19 +7,10 @@ Last-Update: 2013-05-23
 
 --- a/examples/Makefile.am
 +++ b/examples/Makefile.am
-@@ -61,14 +61,16 @@ AM_CFLAGS			=\
- 
- 
- LDADD 			= $(top_builddir)/gtk/libgtkdatabox.la\
--		 	@GTK_LIBS@
-+		 	@GTK_LIBS@\
-+			-lm
- 
- 
+@@ -78,7 +78,8 @@ LDADD 			= $(top_builddir)/gtk/libgtkdat
  if BUILD_LIBGLADE
- basics_libglade_LDADD	= $(top_builddir)/gtk/libgtkdatabox.la \
+ basics_libglade_LDADD	= $(LDADD) \
  			$(top_builddir)/glade/libdatabox.la \
- 		 	@GTK_LIBS@ \
 -			@LIBGLADE_LIBS@
 +			@LIBGLADE_LIBS@ \
 +			-lm
@@ -28,21 +19,13 @@ Last-Update: 2013-05-23
  endif
 --- a/examples/Makefile.in
 +++ b/examples/Makefile.in
-@@ -311,13 +311,15 @@ AM_CFLAGS = \
- 			`pkg-config gtk+-2.0 --cflags`
- 
- LDADD = $(top_builddir)/gtk/libgtkdatabox.la\
--		 	@GTK_LIBS@
-+		 	@GTK_LIBS@\
-+			-lm
- 
+@@ -427,7 +427,8 @@ LDADD = $(top_builddir)/gtk/libgtkdatabo
  @BUILD_LIBGLADE_FALSE at basics_libglade_LDADD = $(LDADD)
- @BUILD_LIBGLADE_TRUE at basics_libglade_LDADD = $(top_builddir)/gtk/libgtkdatabox.la \
+ @BUILD_LIBGLADE_TRUE at basics_libglade_LDADD = $(LDADD) \
  @BUILD_LIBGLADE_TRUE@			$(top_builddir)/glade/libdatabox.la \
- @BUILD_LIBGLADE_TRUE@		 	@GTK_LIBS@ \
 - at BUILD_LIBGLADE_TRUE@			@LIBGLADE_LIBS@
 + at BUILD_LIBGLADE_TRUE@			@LIBGLADE_LIBS@ \
-+ at BUILD_LIBGLADE_TRUE@			-lm
++					-lm
  
  all: all-am
  
diff --git a/debian/patches/06_gladeui-2.0.patch b/debian/patches/06_gladeui-2.0.patch
index 2f4381b..41f9461 100644
--- a/debian/patches/06_gladeui-2.0.patch
+++ b/debian/patches/06_gladeui-2.0.patch
@@ -32,7 +32,7 @@ Last-Update: 2013-05-26
  		AC_MSG_RESULT(not found)
 --- a/configure
 +++ b/configure
-@@ -12868,12 +12868,12 @@ if test -n "$GLADE3_CFLAGS"; then
+@@ -13725,12 +13725,12 @@ if test -n "$GLADE3_CFLAGS"; then
      pkg_cv_GLADE3_CFLAGS="$GLADE3_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -48,7 +48,7 @@ Last-Update: 2013-05-26
  		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -12885,12 +12885,12 @@ if test -n "$GLADE3_LIBS"; then
+@@ -13742,12 +13742,12 @@ if test -n "$GLADE3_LIBS"; then
      pkg_cv_GLADE3_LIBS="$GLADE3_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -64,7 +64,7 @@ Last-Update: 2013-05-26
  		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -12911,9 +12911,9 @@ else
+@@ -13768,9 +13768,9 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -76,7 +76,7 @@ Last-Update: 2013-05-26
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GLADE3_PKG_ERRORS" >&5
-@@ -12934,13 +12934,13 @@ fi
+@@ -13791,13 +13791,13 @@ fi
  
  $as_echo "#define USE_GLADE 1" >>confdefs.h
  
@@ -94,7 +94,7 @@ Last-Update: 2013-05-26
  #define GLADE_CATALOGDIR $glade_catalogdir
 --- a/glade/Makefile.am
 +++ b/glade/Makefile.am
-@@ -12,7 +12,9 @@ INCLUDES = \
+@@ -9,7 +9,9 @@ if BUILD_LIBGLADE
  glademoduledir = @libglade_moduledir@
  glademodule_LTLIBRARIES = libdatabox.la
  
@@ -105,7 +105,7 @@ Last-Update: 2013-05-26
  
  libdatabox_la_LIBADD = \
  	$(top_builddir)/gtk/libgtkdatabox.la	\
-@@ -39,7 +41,9 @@ INCLUDES = \
+@@ -32,7 +34,9 @@ if BUILD_GLADE
  gladeuimoduledir = @glade_moduledir@
  gladeuimodule_LTLIBRARIES = libgladedatabox.la
  
@@ -118,8 +118,8 @@ Last-Update: 2013-05-26
  	$(top_builddir)/gtk/libgtkdatabox.la	\
 --- a/glade/Makefile.in
 +++ b/glade/Makefile.in
-@@ -276,7 +276,10 @@ top_srcdir = @top_srcdir@
- #	@LIBGLADE_CFLAGS@
+@@ -371,7 +371,10 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_
+ # Build the runtime parts for libglade. 
  @BUILD_LIBGLADE_TRUE at glademoduledir = @libglade_moduledir@
  @BUILD_LIBGLADE_TRUE at glademodule_LTLIBRARIES = libdatabox.la
 - at BUILD_LIBGLADE_TRUE@libdatabox_la_CFLAGS = @LIBGLADE_CFLAGS@
@@ -130,8 +130,8 @@ Last-Update: 2013-05-26
  @BUILD_LIBGLADE_TRUE at libdatabox_la_LIBADD = \
  @BUILD_LIBGLADE_TRUE@	$(top_builddir)/gtk/libgtkdatabox.la	\
  @BUILD_LIBGLADE_TRUE@	@LIBGLADE_LIBS@
-@@ -289,7 +292,10 @@ top_srcdir = @top_srcdir@
- 
+@@ -387,7 +390,10 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_
+ # you are going to design with glade-3
  @BUILD_GLADE_TRUE at gladeuimoduledir = @glade_moduledir@
  @BUILD_GLADE_TRUE at gladeuimodule_LTLIBRARIES = libgladedatabox.la
 - at BUILD_GLADE_TRUE@libgladedatabox_la_CFLAGS = @GLADE3_CFLAGS@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libgtkdatabox.git

More information about the debian-science-commits mailing list