[swt-gtk] 04/08: Removed d/patches/fix-glib-2.35-compatibility.patch

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master-4.3
in repository swt-gtk.

commit 71a27c3f5bdf1bfffd20ace3d1c833a5eea49a0c
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Dec 23 12:02:11 2013 +0100

    Removed d/patches/fix-glib-2.35-compatibility.patch
---
 debian/changelog                                 |  1 +
 debian/patches/fix-glib-2.35-compatibility.patch | 45 ------------------------
 debian/patches/series                            |  1 -
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 696946f..0b9cf77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ swt4-gtk (4.3.1-1) UNRELEASED; urgency=medium
 
   [ Jakub Adam ]
   * New upstream release.
+  * Removed d/patches/fix-glib-2.35-compatibility.patch.
 
   [ Ángel Guzmán Maeso ]
   * Update-version-for-package-binaries
diff --git a/debian/patches/fix-glib-2.35-compatibility.patch b/debian/patches/fix-glib-2.35-compatibility.patch
deleted file mode 100644
index d41a4df..0000000
--- a/debian/patches/fix-glib-2.35-compatibility.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c973b9b9be568ebbce618985bc5ee440babf8ab1 Mon Sep 17 00:00:00 2001
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Thu, 27 Jun 2013 10:16:49 +0200
-Subject: [PATCH 1/2] fix-glib-2.35-compatibility
-
-g_thread_init() and g_thread_supported() are deprecated and don't
-have to be used anymore.
----
- os.c |    9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/os.c b/os.c
-index a3085a1..1e550cc 100644
---- a/os.c
-+++ b/os.c
-@@ -4444,9 +4444,9 @@ fail:
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
- 	(JNIEnv *env, jclass that, jintLong arg0)
- {
--	OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
-+	/*OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
- 	g_thread_init((GThreadFunctions *)arg0);
--	OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC);
-+	OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC);*/
- }
- #endif
- 
-@@ -4454,11 +4454,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported)
- 	(JNIEnv *env, jclass that)
- {
--	jboolean rc = 0;
-+	/*jboolean rc = 0;
- 	OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC);
- 	rc = (jboolean)g_thread_supported();
- 	OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC);
--	return rc;
-+	return rc;*/
-+	return 1;
- }
- #endif
- 
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 28d15fd..df7cf10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01-make_linux.patch
-fix-glib-2.35-compatibility.patch
 format-security.diff
 search-usr-lib-jni.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/swt-gtk.git