[Pkg-voip-commits] [sflphone] 12/30: * Fix "Including individual glib headers no longer supported" - Added glib-single-include.patch (Closes: #665610)
tzafrir at debian.org
tzafrir at debian.org
Mon Sep 22 22:23:29 UTC 2014
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository sflphone.
commit 2dbc9873ea78b44a82a1fdd69ff91c27f6883256
Author: Mark Purcell <msp at debian.org>
Date: Mon Oct 8 06:25:38 2012 +0000
* Fix "Including individual glib headers no longer supported"
- Added glib-single-include.patch (Closes: #665610)
git-svn-id: svn://anonscm.alioth.debian.org/svn/pkg-voip/sflphone/trunk@9993 5e74be4b-f5d6-0310-a852-e9e23c5afa6a
---
debian/changelog | 2 +
debian/patches/glib-single-include.patch | 146 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 149 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ff16c95..ce218df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ sflphone (1.2.0-2) UNRELEASED; urgency=low
- Fixes "Please provide the package for KDE front-end" (Closes: #675019)
* Update Build-Depends:
* Update Section: comm/ gnome/ kde
+ * Fix "Including individual glib headers no longer supported"
+ - Added glib-single-include.patch (Closes: #665610)
-- Mark Purcell <msp at debian.org> Sat, 08 Sep 2012 19:27:36 +1000
diff --git a/debian/patches/glib-single-include.patch b/debian/patches/glib-single-include.patch
new file mode 100644
index 0000000..3c9712c
--- /dev/null
+++ b/debian/patches/glib-single-include.patch
@@ -0,0 +1,146 @@
+Description: Remove individual glib headers
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665610
+
+Index: sflphone-1.2.0/gnome/src/actions.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/actions.c 2012-10-08 17:14:09.000000000 +1100
++++ sflphone-1.2.0/gnome/src/actions.c 2012-10-08 17:16:23.000000000 +1100
+@@ -34,7 +34,7 @@
+ #endif
+
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ /* Backward compatibility for gtk < 2.22.0 */
+ #if GTK_CHECK_VERSION(2,22,0)
+ #include <gdk/gdkkeysyms-compat.h>
+Index: sflphone-1.2.0/gnome/src/config/zrtpadvanceddialog.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/config/zrtpadvanceddialog.c 2012-10-08 17:14:09.000000000 +1100
++++ sflphone-1.2.0/gnome/src/config/zrtpadvanceddialog.c 2012-10-08 17:17:02.000000000 +1100
+@@ -29,7 +29,7 @@
+ */
+
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include "str_utils.h"
+ #include "mainwindow.h"
+ #include "zrtpadvanceddialog.h"
+Index: sflphone-1.2.0/gnome/src/config/accountconfigdialog.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/config/accountconfigdialog.c 2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/config/accountconfigdialog.c 2012-10-08 17:18:26.000000000 +1100
+@@ -41,7 +41,7 @@
+ #include <net/if.h>
+ #include <netinet/in.h>
+ #include <string.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+
+ #include "config.h"
+ #include "gtk2_wrappers.h"
+Index: sflphone-1.2.0/gnome/src/config/preferencesdialog.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/config/preferencesdialog.c 2012-10-08 17:14:09.000000000 +1100
++++ sflphone-1.2.0/gnome/src/config/preferencesdialog.c 2012-10-08 17:17:41.000000000 +1100
+@@ -37,7 +37,7 @@
+ #endif
+
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+Index: sflphone-1.2.0/gnome/src/config/tlsadvanceddialog.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/config/tlsadvanceddialog.c 2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/config/tlsadvanceddialog.c 2012-10-08 17:17:58.000000000 +1100
+@@ -36,7 +36,7 @@
+ #include "utils.h"
+ #include <dbus.h>
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <math.h>
+
+ static
+Index: sflphone-1.2.0/gnome/src/eel-gconf-extensions.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/eel-gconf-extensions.c 2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/eel-gconf-extensions.c 2012-10-08 17:18:57.000000000 +1100
+@@ -29,7 +29,7 @@
+
+ #include <gconf/gconf-client.h>
+ #include <gconf/gconf.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <glib.h>
+
+ static GConfClient *global_gconf_client = NULL;
+Index: sflphone-1.2.0/gnome/src/main.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/main.c 2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/main.c 2012-10-08 17:19:12.000000000 +1100
+@@ -37,7 +37,7 @@
+ #include "statusicon.h"
+ #include "eel-gconf-extensions.h"
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <stdlib.h>
+
+ #include "shortcuts.h"
+Index: sflphone-1.2.0/gnome/src/mainwindow.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/mainwindow.c 2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/mainwindow.c 2012-10-08 17:19:41.000000000 +1100
+@@ -60,7 +60,7 @@
+
+ #include <glib/gi18n.h>
+ #include <sys/stat.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+
+ #include <gdk/gdkkeysyms.h>
+
+Index: sflphone-1.2.0/gnome/src/sliders.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/sliders.c 2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/sliders.c 2012-10-08 17:19:24.000000000 +1100
+@@ -35,7 +35,7 @@
+ #include "actions.h"
+ #include "logger.h"
+ #include <string.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+
+ static gdouble value[2];
+ static GtkWidget * slider[2];
+Index: sflphone-1.2.0/gnome/src/statusicon.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/statusicon.c 2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/statusicon.c 2012-10-08 17:19:56.000000000 +1100
+@@ -30,7 +30,7 @@
+ */
+
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include "actions.h"
+ #include "mainwindow.h"
+ #include "accountlist.h"
+Index: sflphone-1.2.0/gnome/src/uimanager.c
+===================================================================
+--- sflphone-1.2.0.orig/gnome/src/uimanager.c 2012-10-08 17:14:10.000000000 +1100
++++ sflphone-1.2.0/gnome/src/uimanager.c 2012-10-08 17:20:08.000000000 +1100
+@@ -41,7 +41,7 @@
+ #include "assistant.h"
+ #include <glib.h>
+ #include <glib/gi18n.h>
+-#include <gtk/gtk.h>
++#include <gtk.h>
+ #include <string.h>
+
+ #include "uimanager.h"
diff --git a/debian/patches/series b/debian/patches/series
index 3dbbc80..31d0329 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+glib-single-include.patch
gcc47-fixes.patch
02_target_s390.patch
#03_binutils-gold.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/sflphone.git
More information about the Pkg-voip-commits
mailing list