Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (976507e6ce2a62139176e8769dd858fc8ea3df93)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (976507e6ce2a62139176e8769dd858fc8ea3df93)
  • Date: Sun, 16 Sep 2007 08:43:33 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

x11-toolkits/wxgtk/DETAILS | 6 +++---
x11-toolkits/wxgtk/HISTORY | 8 ++++++++
x11-toolkits/wxgtk/PRE_BUILD | 6 ++++++
x11-toolkits/wxgtk/debdiff.patch | 24 ++++++++++++++++++++++++
4 files changed, 41 insertions(+), 3 deletions(-)

New commits:
commit 976507e6ce2a62139176e8769dd858fc8ea3df93
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

wxgtk: updated to 2.8.5, added bugfix for 2.6.4

diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index c58ac8d..4e6e64e 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -1,11 +1,12 @@
SPELL=wxgtk
SPELLX=wxGTK
if [[ "$WX_DEV" == "y" ]];then
- VERSION=2.8.4
-
SOURCE_HASH=sha512:655678285e50d672df58672455f17cf607905ef5a2c7940e0ffbd700c08a48bf0aa07067a8c2f3519e80d62807cfd12f0347727a1561d13b4702e5a99157fccb
+ VERSION=2.8.5
+
SOURCE_HASH=sha512:472ce32e2f2138c48e749d502c6e2a7c332a8427b95238554564d745bd8ac16b115114e3477cf932beb19803f21773bcadcd7e86d7f7963f7fd42478025976d4
else
VERSION=2.6.4

SOURCE_HASH=sha512:53b3a1a111288910b18e3743d8e389398bf7e60cddbf0ad609cd72fa4fbd5da2bb9b3b94427ba7ec9d695fb1cbca5fa79a1836a15c652aebf2ae605b1f93f4c5
+ PATCHLEVEL=2
fi
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
@@ -14,7 +15,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
LICENSE[0]=http://www.wxwidgets.org/licence3.txt
WEB_SITE=http://www.wxwidgets.org/
ENTERED=20011217
- PATCHLEVEL=1
TMPFS=off
KEYWORDS="x11 libs"
SHORT='GTK+ verion of wxWidgets API'
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 1e1551e..4698421 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,11 @@
+2007-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, debdiff.patch: patch to fix an issue triggered by glibc
+ 2.6, see
+ https://bugs.launchpad.net/mandriva/+source/vlc/+bug/120278, thanks
+ to the ubuntu guys for backporting the upstream fix
+ * DETAILS: updated 2.8 version to 2.8.5, fixes the same issue, moved
+ PATCHLEVEL to 2.6 version and incremented
+
2007-09-07 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: PATCLEVEL++
* BUILD, INSTALL: fixed if statements in xrc skipping,
diff --git a/x11-toolkits/wxgtk/PRE_BUILD b/x11-toolkits/wxgtk/PRE_BUILD
new file mode 100755
index 0000000..3b1d034
--- /dev/null
+++ b/x11-toolkits/wxgtk/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [[ $WX_DEV != y ]]; then
+ patch -p1 < $SPELL_DIRECTORY/debdiff.patch
+fi
diff --git a/x11-toolkits/wxgtk/debdiff.patch
b/x11-toolkits/wxgtk/debdiff.patch
new file mode 100644
index 0000000..06c99b4
--- /dev/null
+++ b/x11-toolkits/wxgtk/debdiff.patch
@@ -0,0 +1,24 @@
+diff -pruN wxwidgets2.6-2.6.3.2.1.5ubuntu9/src/gtk/button.cpp
wxwidgets2.6-2.6.3.2.1.5ubuntu10/src/gtk/button.cpp
+--- wxwidgets2.6-2.6.3.2.1.5ubuntu9/src/gtk/button.cpp 2006-05-01
07:38:40.000000000 +0300
++++ wxwidgets2.6-2.6.3.2.1.5ubuntu10/src/gtk/button.cpp 2007-06-25
23:40:33.000000000 +0300
+@@ -89,7 +89,7 @@ gtk_button_style_set_callback( GtkWidget
+ right_border += default_border->right;
+ top_border += default_border->top;
+ bottom_border += default_border->bottom;
+- g_free( default_border );
++ gtk_border_free( default_border );
+ }
+ #else
+ left_border = 6;
+diff -pruN wxwidgets2.6-2.6.3.2.1.5ubuntu9/src/gtk/window.cpp
wxwidgets2.6-2.6.3.2.1.5ubuntu10/src/gtk/window.cpp
+--- wxwidgets2.6-2.6.3.2.1.5ubuntu9/src/gtk/window.cpp 2006-05-01
07:38:40.000000000 +0300
++++ wxwidgets2.6-2.6.3.2.1.5ubuntu10/src/gtk/window.cpp 2007-06-25
23:47:35.000000000 +0300
+@@ -3276,7 +3276,7 @@ void wxWindowGTK::DoSetSize( int x, int
+ right_border += default_border->right;
+ top_border += default_border->top;
+ bottom_border += default_border->bottom;
+- g_free( default_border );
++ gtk_border_free( default_border );
+ }
+ #else
+ left_border = 6;



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (976507e6ce2a62139176e8769dd858fc8ea3df93), Arwed von Merkatz, 09/16/2007

Archive powered by MHonArc 2.6.24.

Top of Page