Browse Source

l/wxwidgets-gtk: Upgraded to wxwidgets-gtk-2.8.12.

slackware-14.2
Damien Goutte-Gattat 11 years ago
parent
commit
37ec8db70e
  1. 1
      l/wxwidgets-gtk/wxGTK-2.8.11.tar.gz.sha1
  2. 30
      l/wxwidgets-gtk/wxGTK-2.8.12-dataviewctrl-pointer-cast-fix.diff
  3. 1
      l/wxwidgets-gtk/wxGTK-2.8.12.tar.gz.sha1
  4. 45
      l/wxwidgets-gtk/wxwidgets-gtk.SlackBuild

1
l/wxwidgets-gtk/wxGTK-2.8.11.tar.gz.sha1

@ -1 +0,0 @@
f5426533db98990a905d32e1c7928a7584dbd80e wxGTK-2.8.11.tar.gz

30
l/wxwidgets-gtk/wxGTK-2.8.12-dataviewctrl-pointer-cast-fix.diff

@ -0,0 +1,30 @@
diff -Naur wxGTK-2.8.12.orig/src/gtk/dataview.cpp wxGTK-2.8.12/src/gtk/dataview.cpp
--- wxGTK-2.8.12.orig/src/gtk/dataview.cpp 2011-03-22 13:18:57.000000000 +0100
+++ wxGTK-2.8.12/src/gtk/dataview.cpp 2011-11-04 10:58:56.581017157 +0100
@@ -37,6 +37,8 @@
#include <gdk/gdkkeysyms.h>
+#include <stdint.h> // for uintptr_t
+
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
@@ -311,7 +313,7 @@
g_value_init( value, G_TYPE_STRING );
model->GetValue( variant,
(unsigned int) column,
- (unsigned int) iter->user_data );
+ (uintptr_t) iter->user_data );
// FIXME: we should support different encodings here
g_value_set_string( value, wxGTK_CONV_SYS(variant.GetString()) );
@@ -1417,7 +1419,7 @@
wxDataViewRenderer *cell = (wxDataViewRenderer*) data;
- unsigned int model_row = (unsigned int) iter->user_data;
+ uintptr_t model_row = (uintptr_t) iter->user_data;
wxVariant value;
list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );

1
l/wxwidgets-gtk/wxGTK-2.8.12.tar.gz.sha1

@ -0,0 +1 @@
56cc7f6622dd6f2fecd43fc210dc1c6cb155b37f wxGTK-2.8.12.tar.gz

45
l/wxwidgets-gtk/wxwidgets-gtk.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2008,2009,2010 Damien Goutte-Gattat
# Copyright (C) 2008,2009,2010,2011 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -29,7 +29,7 @@
# Source package infos
NAMESRC=${NAMESRC:-wxGTK}
VERSION=${VERSION:-2.8.11}
VERSION=${VERSION:-2.8.12}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
WGET=${WGET:-http://downloads.sourceforge.net/wxwindows/$ARCHIVE}
@ -85,30 +85,49 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
patch -p 1 < $CWD/wxGTK-2.8.12-dataviewctrl-pointer-cast-fix.diff
# ANSI version
mkdir build_ansi && cd build_ansi
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
./configure \
../configure \
--prefix=/usr \
--libdir=/usr/lib$LIBDIRSUFFIX \
--enable-plugins \
--enable-shared \
--enable-optimise \
--disable-profile \
--with-sdl \
--with-opengl \
--enable-unicode \
--disable-unicode \
--enable-stl \
--enable-mediactrl \
--enable-graphics_ctx \
--enable-controls \
--enable-tabdialog \
--disable-dataviewctrl # broken on x86_64 (type size issue), disabling
# until a better solution (fix) is found
--enable-dataviewctrl
make -j $JOBS
make install DESTDIR=$PKG
make -j $JOBS -C contrib/src all install DESTDIR=$PKG
# Build contribs
make -j $JOBS -C contrib/src
make -C contrib/src install DESTDIR=$PKG
# Unicode version
mkdir ../build_unicode && cd ../build_unicode
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
../configure \
--prefix=/usr \
--libdir=/usr/lib$LIBDIRSUFFIX \
--enable-plugins \
--with-sdl \
--with-opengl \
--enable-unicode \
--enable-stl \
--enable-mediactrl \
--enable-graphics_ctx \
--enable-controls \
--enable-tabdialog \
--enable-dataviewctrl
make -j $JOBS
make install DESTDIR=$PKG
make -j $JOBS -C contrib/src all install DESTDIR=$PKG
# Strip binaries
find $PKG | xargs file | grep "ELF \(32\|64\)-bit LSB" | cut -d : -f 1 | \
@ -116,7 +135,7 @@ find $PKG | xargs file | grep "ELF \(32\|64\)-bit LSB" | cut -d : -f 1 | \
# Install the documentation
mkdir -p $PKG/usr/doc
cp -R docs $PKG/usr/doc/$NAME
cp -R ../docs $PKG/usr/doc/$NAMEPKG-$VERSION
# Copy slack-desc file
install -D -m 0644 $CWD/slack-desc $PKG/install/slack-desc

Loading…
Cancel
Save