[med-svn] r22490 - in trunk/packages/gdpc/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-07-12 08:03:17 +0000 (Tue, 12 Jul 2016)
New Revision: 22490

Added:
   trunk/packages/gdpc/trunk/debian/patches/41_glib_deprecated_funcs.patch
Modified:
   trunk/packages/gdpc/trunk/debian/changelog
   trunk/packages/gdpc/trunk/debian/control
   trunk/packages/gdpc/trunk/debian/patches/series
   trunk/packages/gdpc/trunk/debian/rules
Log:
  * Fix implicit function declarations (Thanks for the patch to  Logan Rosen
    <logan at ubuntu.com>)
    Closes: #815041
  * cme fix dpkg-control
  * hardening=+all



Modified: trunk/packages/gdpc/trunk/debian/changelog
===================================================================
--- trunk/packages/gdpc/trunk/debian/changelog	2016-07-11 19:31:03 UTC (rev 22489)
+++ trunk/packages/gdpc/trunk/debian/changelog	2016-07-12 08:03:17 UTC (rev 22490)
@@ -1,3 +1,13 @@
+gdpc (2.2.5-5) unstable; urgency=medium
+
+  * Fix implicit function declarations (Thanks for the patch to  Logan Rosen
+    <logan at ubuntu.com>)
+    Closes: #815041
+  * cme fix dpkg-control
+  * hardening=+all
+
+ -- Andreas Tille <tille at debian.org>  Tue, 12 Jul 2016 09:47:36 +0200
+
 gdpc (2.2.5-4) unstable; urgency=medium
 
   * Remove menu file

Modified: trunk/packages/gdpc/trunk/debian/control
===================================================================
--- trunk/packages/gdpc/trunk/debian/control	2016-07-11 19:31:03 UTC (rev 22489)
+++ trunk/packages/gdpc/trunk/debian/control	2016-07-12 08:03:17 UTC (rev 22490)
@@ -6,7 +6,7 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                libgtk2.0-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdpc/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/gdpc/trunk/
 Homepage: http://www.frantz.fi/software/gdpc.php

Added: trunk/packages/gdpc/trunk/debian/patches/41_glib_deprecated_funcs.patch
===================================================================
--- trunk/packages/gdpc/trunk/debian/patches/41_glib_deprecated_funcs.patch	                        (rev 0)
+++ trunk/packages/gdpc/trunk/debian/patches/41_glib_deprecated_funcs.patch	2016-07-12 08:03:17 UTC (rev 22490)
@@ -0,0 +1,47 @@
+Author: Logan Rosen <logan at ubuntu.com>
+Last-Update: Thu, 18 Feb 2016 01:24:16 -0500
+Bug-Debian: https://bugs.debian.org/815041
+Description: Fix implicit function declarations
+
+--- gdpc-2.2.5.orig/main.c	2009-04-21 14:03:07.000000000 -0400
++++ gdpc-2.2.5/main.c	2013-04-07 21:21:46.208492431 -0400
+@@ -848,9 +848,9 @@
+ #endif
+ 
+   for (i=0;i<NUMFRAMES;i++) {
+-	params->frameready[i] = g_mutex_new();
++	g_mutex_init (params->frameready[i]);
+ 	g_mutex_lock (params->frameready[i]);
+-	params->framedrawn[i] = g_mutex_new();
++	g_mutex_init (params->framedrawn[i]);
+ 	g_mutex_unlock (params->framedrawn[i]);
+ 	params->framedata[i] = NULL;
+     }
+@@ -860,15 +860,15 @@
+ printf("Initialising filewait/EOF semaphores.\n");
+ #endif
+ 
+-    params->filewait = g_mutex_new();
++    g_mutex_init (params->filewait);
+     g_mutex_lock (params->filewait);
+-    params->atEnd = g_mutex_new();
++    g_mutex_init (params->atEnd);
+ 
+ #if Debug 
+ printf("Starting filereading thread.\n");
+ #endif
+ 
+-    th_a = g_thread_create ((GThreadFunc) readinput, (gpointer) params, TRUE, NULL);
++    th_a = g_thread_try_new ("some_thread", (GThreadFunc) readinput, (gpointer) params, NULL);
+     if (th_a == NULL) {
+ 	fprintf(stderr, "Creating read thread failed.\n");
+ 	gtk_main_quit ();
+@@ -927,8 +927,6 @@
+ /* Start gtk initialization. */
+     gtk_init (&argc, &argv);
+ 
+-    g_thread_init(NULL);
+-
+     printf("\n gdpc version "GDPCVER", Copyright (C) 2000 Jonas Frantz\n");
+     printf(" gdpc comes with ABSOLUTELY NO WARRANTY; for details\n");
+     printf(" check out the documentation.  This is free software, and\n"); 

Modified: trunk/packages/gdpc/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdpc/trunk/debian/patches/series	2016-07-11 19:31:03 UTC (rev 22489)
+++ trunk/packages/gdpc/trunk/debian/patches/series	2016-07-12 08:03:17 UTC (rev 22490)
@@ -1,4 +1,5 @@
 20_Makefile_options.patch
 30_gdk_enable_deprecated.patch
 40_fix_gcc4.8_build.patch
+41_glib_deprecated_funcs.patch
 hardening.patch

Modified: trunk/packages/gdpc/trunk/debian/rules
===================================================================
--- trunk/packages/gdpc/trunk/debian/rules	2016-07-11 19:31:03 UTC (rev 22489)
+++ trunk/packages/gdpc/trunk/debian/rules	2016-07-12 08:03:17 UTC (rev 22490)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@