Browse Source

l/wxwidgets-gtk: Added patch for compiling against GLib > 2.22.

slackware-14.2
Damien Goutte-Gattat 13 years ago
parent
commit
2091818259
  1. 14
      l/wxwidgets-gtk/patch-gsocket.diff
  2. 5
      l/wxwidgets-gtk/wxwidgets-gtk.SlackBuild

14
l/wxwidgets-gtk/patch-gsocket.diff

@ -0,0 +1,14 @@
diff -Naur wxGTK-2.8.10.orig/src/gtk/gsockgtk.cpp wxGTK-2.8.10.mod/src/gtk/gsockgtk.cpp
--- wxGTK-2.8.10.orig/src/gtk/gsockgtk.cpp 2009-03-06 13:18:08.000000000 +0100
+++ wxGTK-2.8.10.mod/src/gtk/gsockgtk.cpp 2010-02-07 18:11:13.533613008 +0100
@@ -15,8 +15,10 @@
#include <stdlib.h>
#include <stdio.h>
+#define GSocket GlibGSocket
#include <gdk/gdk.h>
#include <glib.h>
+#undef GSocket
#include "wx/gsocket.h"
#include "wx/unix/gsockunx.h"

5
l/wxwidgets-gtk/wxwidgets-gtk.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2008,2009 Damien Goutte-Gattat
# Copyright (C) 2008,2009,2010 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -35,7 +35,7 @@ WGET=${WGET:-http://downloads.sourceforge.net/wxwindows/$ARCHIVE}
# Build infos
NAMEPKG=${NAMEPKG:-wxwidgets-gtk}
BUILD=${BUILD:-1GGD}
BUILD=${BUILD:-2GGD}
ARCH=${ARCH:-i486}
JOBS=${JOBS:-1}
EXT=${EXT:-txz}
@ -85,6 +85,7 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
patch -p 1 < $CWD/patch-gsocket.diff
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
./configure \

Loading…
Cancel
Save