[med-svn] r22054 - in trunk/packages/mgltools/opengltk/trunk/debian: . patches

[Steffen Möller]

Author: moeller
Date: 2016-05-31 17:52:39 +0000 (Tue, 31 May 2016)
New Revision: 22054

Added:
   trunk/packages/mgltools/opengltk/trunk/debian/patches/update_8.4_to_8.6.patch
Modified:
   trunk/packages/mgltools/opengltk/trunk/debian/patches/series
   trunk/packages/mgltools/opengltk/trunk/debian/patches/tcllib.patch
   trunk/packages/mgltools/opengltk/trunk/debian/rules
Log:
better Tk8.6 update

Modified: trunk/packages/mgltools/opengltk/trunk/debian/patches/series
===================================================================
--- trunk/packages/mgltools/opengltk/trunk/debian/patches/series	2016-05-31 17:39:29 UTC (rev 22053)
+++ trunk/packages/mgltools/opengltk/trunk/debian/patches/series	2016-05-31 17:52:39 UTC (rev 22054)
@@ -1,2 +1,3 @@
 tcllib.patch
 #20.05.2013, ta, applied upstream: opengl.patch
+update_8.4_to_8.6.patch

Modified: trunk/packages/mgltools/opengltk/trunk/debian/patches/tcllib.patch
===================================================================
--- trunk/packages/mgltools/opengltk/trunk/debian/patches/tcllib.patch	2016-05-31 17:39:29 UTC (rev 22053)
+++ trunk/packages/mgltools/opengltk/trunk/debian/patches/tcllib.patch	2016-05-31 17:52:39 UTC (rev 22054)
@@ -1,9 +1,11 @@
 Description: use general stub lib instead of versioned stub
 Author: Thorsten Alteholz <debian at alteholz.de>
 Last-Update: 2011-06-12
---- opengltk.org/setup.py    2011-06-12 08:46:22.000000000 +0200
-+++ opengltk/setup.py      2011-06-09 18:35:41.000000000 +0200
-@@ -144,10 +144,10 @@
+Index: opengltk-1.5.7~rc1+cvs.20160212/setup.py
+===================================================================
+--- opengltk-1.5.7~rc1+cvs.20160212.orig/setup.py
++++ opengltk-1.5.7~rc1+cvs.20160212/setup.py
+@@ -142,10 +142,10 @@ elif os.name == 'nt': #for Windows
  ###################################################################
  
  if tcltk_ver == '8.4':

Added: trunk/packages/mgltools/opengltk/trunk/debian/patches/update_8.4_to_8.6.patch
===================================================================
--- trunk/packages/mgltools/opengltk/trunk/debian/patches/update_8.4_to_8.6.patch	                        (rev 0)
+++ trunk/packages/mgltools/opengltk/trunk/debian/patches/update_8.4_to_8.6.patch	2016-05-31 17:52:39 UTC (rev 22054)
@@ -0,0 +1,17 @@
+Index: mgltools-opengltk-1.5.7+cvs.20160526/tkdnd2.0/unix/Makefile
+===================================================================
+--- mgltools-opengltk-1.5.7+cvs.20160526.orig/tkdnd2.0/unix/Makefile
++++ mgltools-opengltk-1.5.7+cvs.20160526/tkdnd2.0/unix/Makefile
+@@ -5,10 +5,10 @@ all:
+         -I /usr/include -I /usr/include/tk-private/generic \
+         -I /usr/include/tcl-private/generic \
+ 	-I /mgl/prog/share/include -I ../../include \
+-        -L /usr/lib -L /mgl/prog/i86Linux2/lib -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -ltclstub8.4 -ltkstub8.4 -o ../libtkdnd20.so
++        -L /usr/lib -L /mgl/prog/i86Linux2/lib -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -ltclstub8.6 -ltkstub8.6 -o ../libtkdnd20.so
+ 
+ swig:
+ 	/usr/bin/swig -tcl -module tkdnd TkDND_X.h
+ 	gcc -shared -fPIC TkDND_X_wrap.c -D USE_TCL_STUBS -D USE_TK_STUBS -I \
+-        /usr/include -L/usr/lib -ltclstub8.4 -ltkstub8.4 -o libtkdnd.so
++        /usr/include -L/usr/lib -ltclstub8.6 -ltkstub8.6 -o libtkdnd.so
+ 

Modified: trunk/packages/mgltools/opengltk/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/opengltk/trunk/debian/rules	2016-05-31 17:39:29 UTC (rev 22053)
+++ trunk/packages/mgltools/opengltk/trunk/debian/rules	2016-05-31 17:52:39 UTC (rev 22054)
@@ -8,6 +8,7 @@
 BRANCH=`cat debian/get-orig-source/current-branch`
 RCVERSION=`cat debian/get-orig-source/rc-version`
 SRC=opengltkDIST
+export CFLAGS=-D_UNISTD -DSTDC_HEADERS
 
 %:
 	dh $@ --with python2