mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-24 10:02:29 +01:00
libraries/gtkglextmm: Add patches to work with glib in 14.1
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Willy Sudiarto Raharjo
parent
19a6d5d90b
commit
27a379a8fc
2 changed files with 126 additions and 2 deletions
121
libraries/gtkglextmm/fix_ftbfs_gtk_2_36
Normal file
121
libraries/gtkglextmm/fix_ftbfs_gtk_2_36
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
|
||||
===================================================================
|
||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200
|
||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200
|
||||
@@ -1,15 +1,8 @@
|
||||
-
|
||||
-#include <glib.h>
|
||||
-
|
||||
// Disable the 'const' function attribute of the get_type() functions.
|
||||
// GCC would optimize them out because we don't use the return value.
|
||||
#undef G_GNUC_CONST
|
||||
#define G_GNUC_CONST /* empty */
|
||||
|
||||
-#include <gdkmm/gl/wrap_init.h>
|
||||
-#include <glibmm/error.h>
|
||||
-#include <glibmm/object.h>
|
||||
-
|
||||
// #include the widget headers so that we can call the get_type() static methods:
|
||||
|
||||
#include "tokens.h"
|
||||
@@ -19,6 +12,12 @@
|
||||
#include "pixmap.h"
|
||||
#include "window.h"
|
||||
|
||||
+#include <glib.h>
|
||||
+
|
||||
+#include <gdkmm/gl/wrap_init.h>
|
||||
+#include <glibmm/error.h>
|
||||
+#include <glibmm/object.h>
|
||||
+
|
||||
extern "C"
|
||||
{
|
||||
|
||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
|
||||
===================================================================
|
||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200
|
||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200
|
||||
@@ -17,10 +17,10 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
||||
*/
|
||||
|
||||
-#include <gdk/gdkglquery.h>
|
||||
-
|
||||
#include "query.h"
|
||||
|
||||
+#include <gdk/gdkglquery.h>
|
||||
+
|
||||
namespace Gdk
|
||||
{
|
||||
namespace GL
|
||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
|
||||
===================================================================
|
||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200
|
||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200
|
||||
@@ -17,11 +17,11 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
||||
*/
|
||||
|
||||
+#include "pixmapext.h"
|
||||
+
|
||||
#include <gdk/gdkgldrawable.h>
|
||||
#include <gdk/gdkglpixmap.h>
|
||||
|
||||
-#include "pixmapext.h"
|
||||
-
|
||||
namespace Gdk
|
||||
{
|
||||
namespace GL
|
||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
|
||||
===================================================================
|
||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200
|
||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200
|
||||
@@ -17,11 +17,11 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
||||
*/
|
||||
|
||||
+#include "windowext.h"
|
||||
+
|
||||
#include <gdk/gdkgldrawable.h>
|
||||
#include <gdk/gdkglwindow.h>
|
||||
|
||||
-#include "windowext.h"
|
||||
-
|
||||
namespace Gdk
|
||||
{
|
||||
namespace GL
|
||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
|
||||
===================================================================
|
||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200
|
||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200
|
||||
@@ -17,10 +17,10 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
||||
*/
|
||||
|
||||
-#include <gdk/gdkglfont.h>
|
||||
-
|
||||
#include "font.h"
|
||||
|
||||
+#include <gdk/gdkglfont.h>
|
||||
+
|
||||
namespace Gdk
|
||||
{
|
||||
namespace GL
|
||||
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
|
||||
===================================================================
|
||||
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100
|
||||
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
#include <cstdlib>
|
||||
|
||||
-#include <gdk/gdkglinit.h>
|
||||
-
|
||||
#include "wrap_init.h"
|
||||
#include "init.h"
|
||||
|
||||
+#include <gdk/gdkglinit.h>
|
||||
+
|
||||
namespace Gdk
|
||||
{
|
||||
namespace GL
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
PRGNAM=gtkglextmm
|
||||
VERSION=${VERSION:-1.2.0}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
|
@ -55,6 +55,9 @@ find . \
|
|||
# https://trac.macports.org/attachment/ticket/27059/patch-gtkglext_gtkmm_gl-widget.cc.diff
|
||||
patch -p0 < $CWD/patch-gtkglext_gtkmm_gl-widget.cc.diff
|
||||
|
||||
# Patch from Debian Unstable
|
||||
patch -p1 < $CWD/fix_ftbfs_gtk_2_36
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
|
|
@ -73,7 +76,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
|
|||
|
||||
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
cp -a \
|
||||
AUTHORS COPYING* ChangeLog* INSTALL NEWS README* TODO \
|
||||
AUTHORS COPYING* ChangeLog* INSTALL NEWS README* \
|
||||
$PKG/usr/doc/$PRGNAM-$VERSION
|
||||
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue