summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsl1pkn072015-06-08 21:11:39 +0200
committersl1pkn072015-06-08 21:11:39 +0200
commit15422887dc23f4b0ecc30d7b2706a2853a87eced (patch)
tree4d8b1ed62bc6c2db1427f1a1f0008ce2ea352170
downloadaur-15422887dc23f4b0ecc30d7b2706a2853a87eced.tar.gz
Initial commit
-rw-r--r--.SRCINFO55
-rw-r--r--.gitignore8
-rw-r--r--PKGBUILD114
-rw-r--r--config-2.8.conf4
-rw-r--r--make-abicheck-non-fatal.patch15
-rw-r--r--wx-config-2.8.sh5
-rw-r--r--wxwidgets-2.8-collision.patch81
7 files changed, 282 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 00000000000..d4e5435433c
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,55 @@
+pkgbase = wxwidgets2.8-light
+ pkgdesc = wxWidgets suite for Base and GTK2 toolkits (GNOME/GStreamer free!)
+ pkgver = 2.8.12.1
+ pkgrel = 8
+ url = http://wxwidgets.org
+ arch = i686
+ arch = x86_64
+ license = custom:wxWindows
+ makedepends = git
+ makedepends = bash
+ makedepends = glu
+ makedepends = gtk2
+ makedepends = libsm
+ makedepends = sdl
+ makedepends = expat
+ makedepends = zlib
+ source = wxwidgets::git+https://github.com/wxWidgets/wxPython.git#tag=wxPy-2.8.12.1
+ source = wxwidgets-2.8-collision.patch
+ source = config-2.8.conf
+ source = wx-config-2.8.sh
+ source = make-abicheck-non-fatal.patch
+ sha1sums = SKIP
+ sha1sums = 75d2292a0058570aa6071b4bee6eef69e47f1208
+ sha1sums = 1539fb4299a05d32dc739b478986cf3b3017d1b9
+ sha1sums = 4156d992b8fbbdc8e596a7c4e548e90295d3cf95
+ sha1sums = dfe38650c655395b90bf082b5734c4093508bfa3
+
+pkgname = wxbase2.8-light
+ pkgdesc = wxWidgets 2.8 Base (GNOME/GStreamer free!)
+ depends = wxcommon2.8-light
+ depends = expat
+ depends = zlib
+ provides = wxbase2.8=2.8.12.1
+ conflicts = wxbase2.8
+ options = !emptydirs
+
+pkgname = wxgtk2.8-light
+ pkgdesc = wxWidgets 2.8 with GTK2 Toolkit (GNOME/GStreamer free!)
+ depends = wxbase2.8-light
+ depends = gtk2
+ depends = libsm
+ depends = sdl
+ provides = wxgtk2.8=2.8.12.1
+ conflicts = wxgtk2.8
+ options = !emptydirs
+
+pkgname = wxcommon2.8-light
+ pkgdesc = wxWidgets 2.8 common (GNOME/GStreamer free!)
+ arch = any
+ depends = bash
+ provides = wxcommon2.8=2.8.12.1
+ conflicts = wxcommon2.8
+ options = !emptydirs
+ backup = etc/wx/config-2.8
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..98f24344476
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!config-2.8.conf
+!wx-config-2.8.sh
+!make-abicheck-non-fatal.patch
+!wxwidgets-2.8-collision.patch
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 00000000000..1bf9ffa5353
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,114 @@
+# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
+
+pkgbase="wxwidgets2.8-light"
+pkgname=('wxbase2.8-light' 'wxgtk2.8-light' 'wxcommon2.8-light')
+pkgver=2.8.12.1
+pkgrel=8
+pkgdesc="wxWidgets suite for Base and GTK2 toolkits (GNOME/GStreamer free!)"
+arch=('i686' 'x86_64')
+url="http://wxwidgets.org"
+license=('custom:wxWindows')
+makedepends=('git' 'bash' 'glu' 'gtk2' 'libsm' 'sdl' 'expat' 'zlib')
+source=("wxwidgets::git+https://github.com/wxWidgets/wxPython.git#tag=wxPy-${pkgver}"
+ 'wxwidgets-2.8-collision.patch'
+ 'config-2.8.conf'
+ 'wx-config-2.8.sh'
+ 'make-abicheck-non-fatal.patch')
+sha1sums=('SKIP'
+ '75d2292a0058570aa6071b4bee6eef69e47f1208'
+ '1539fb4299a05d32dc739b478986cf3b3017d1b9'
+ '4156d992b8fbbdc8e596a7c4e548e90295d3cf95'
+ 'dfe38650c655395b90bf082b5734c4093508bfa3')
+
+prepare() {
+ patch -d wxwidgets -p1 -i ../wxwidgets-2.8-collision.patch
+
+ # C++ ABI check is too strict and breaks with GCC 5.1
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
+ patch -d wxwidgets -Np1 -i ../make-abicheck-non-fatal.patch
+
+ mkdir -p build-{base,gtk}
+}
+
+build() {
+ cd "${srcdir}/build-base"
+ ../wxwidgets/configure \
+ --prefix=/usr \
+ --libdir=/usr/lib \
+ --with-regex='builtin' \
+ --enable-unicode \
+ --disable-{precomp-headers,gui}
+ make
+ make -C ../wxwidgets/locale allmo
+
+ cd "${srcdir}/build-gtk"
+ ../wxwidgets/configure \
+ --prefix=/usr \
+ --libdir=/usr/lib \
+ --with-gtk='2' \
+ --with-lib{jpeg,png,tiff,xpm}='sys' \
+ --with-regex='builtin' \
+ --with-{opengl,sdl} \
+ --enable-{graphics_ctx,unicode} \
+ --without-{libnotify,gnomevfs,gnomeprint} \
+ --disable-{mediactrl,precomp-headers,webview}
+ make
+ make -C ../wxwidgets/locale allmo
+}
+
+package_wxbase2.8-light() {
+ pkgdesc="wxWidgets 2.8 Base (GNOME/GStreamer free!)"
+ depends=('wxcommon2.8-light' 'expat' 'zlib')
+ provides=("wxbase2.8=${pkgver}")
+ conflicts=('wxbase2.8')
+ options=('!emptydirs')
+
+ make -C build-base DESTDIR="${pkgdir}" install
+
+ rm -fr "${pkgdir}/usr/bin/wx-config-2.8"
+ rm -fr "${pkgdir}/usr/include"
+ rm -fr "${pkgdir}/usr/share/"
+
+ install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxbase2.8-light/LICENSE"
+}
+
+package_wxgtk2.8-light() {
+ pkgdesc="wxWidgets 2.8 with GTK2 Toolkit (GNOME/GStreamer free!)"
+ depends=('wxbase2.8-light' 'gtk2' 'libsm' 'sdl')
+ provides=("wxgtk2.8=${pkgver}")
+ conflicts=('wxgtk2.8')
+ options=('!emptydirs')
+
+ make -C build-gtk DESTDIR="${pkgdir}" install
+
+ rm -fr "${pkgdir}/usr/bin/"wx-config*
+ rm -fr "${pkgdir}/usr/include"
+ rm -fr "${pkgdir}/usr/lib/"*baseu*
+ rm -fr "${pkgdir}/usr/share"
+
+ install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxgtk2.8-light/LICENSE"
+}
+
+package_wxcommon2.8-light() {
+ pkgdesc="wxWidgets 2.8 common (GNOME/GStreamer free!)"
+ arch=('any')
+ depends=('bash')
+ provides=("wxcommon2.8=${pkgver}")
+ conflicts=('wxcommon2.8')
+ options=('!emptydirs')
+ backup=('etc/wx/config-2.8')
+
+ make -C build-base DESTDIR="${pkgdir}" install
+
+ rm -fr "${pkgdir}/usr/bin"
+
+ make -C build-gtk DESTDIR="${pkgdir}" install
+
+ rm -fr "${pkgdir}/usr/bin"
+ rm -fr "${pkgdir}/usr/lib"
+
+ install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxcommon2.8-light/LICENSE"
+
+ install -Dm644 config-2.8.conf "${pkgdir}/etc/wx/config-2.8"
+ install -Dm755 wx-config-2.8.sh "${pkgdir}/usr/bin/wx-config-2.8"
+} \ No newline at end of file
diff --git a/config-2.8.conf b/config-2.8.conf
new file mode 100644
index 00000000000..571abde3c3b
--- /dev/null
+++ b/config-2.8.conf
@@ -0,0 +1,4 @@
+# Set wx-config 2.8 executable
+
+#wx=base-unicode-release-2.8
+wx=gtk2-unicode-release-2.8
diff --git a/make-abicheck-non-fatal.patch b/make-abicheck-non-fatal.patch
new file mode 100644
index 00000000000..97055ba46fa
--- /dev/null
+++ b/make-abicheck-non-fatal.patch
@@ -0,0 +1,15 @@
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
++++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+ msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+ lib.c_str(), progName.c_str(), prog.c_str());
+
+- wxLogFatalError(msg.c_str());
+-
+- // normally wxLogFatalError doesn't return
+- return false;
++ wxLogWarning(msg.c_str());
+ }
+ #undef wxCMP
+
diff --git a/wx-config-2.8.sh b/wx-config-2.8.sh
new file mode 100644
index 00000000000..c29a2d35375
--- /dev/null
+++ b/wx-config-2.8.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source /etc/wx/config-2.8
+
+. /usr/lib/wx/config/$wx $@
diff --git a/wxwidgets-2.8-collision.patch b/wxwidgets-2.8-collision.patch
new file mode 100644
index 00000000000..36d8acf26be
--- /dev/null
+++ b/wxwidgets-2.8-collision.patch
@@ -0,0 +1,81 @@
+diff -Naur wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl wxPython-src-2.8.12.1/build/bakefiles/wx.bkl
+--- wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl 2014-01-04 22:28:16.491774907 -0500
++++ wxPython-src-2.8.12.1/build/bakefiles/wx.bkl 2014-01-04 22:37:39.610020870 -0500
+@@ -128,7 +128,7 @@
+ <using module="gettext"/>
+ <gettext-catalogs id="locale">
+ <srcdir>$(SRCDIR)/locale</srcdir>
+- <catalog-name>wxstd</catalog-name>
++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+ <linguas>
+ ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+ zh zh_CN zh_TW
+diff -Naur wxPython-src-2.8.12.1.orig/Makefile.in wxPython-src-2.8.12.1/Makefile.in
+--- wxPython-src-2.8.12.1.orig/Makefile.in 2014-01-04 22:28:16.545107766 -0500
++++ wxPython-src-2.8.12.1/Makefile.in 2014-01-04 22:40:27.191813403 -0500
+@@ -11695,9 +11695,11 @@
+
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin2.8.m4)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++ for i in wx.bkl wx_unix.bkl wx_win32.bkl ; do \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+ if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+@@ -12455,7 +12456,8 @@
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -12463,7 +12465,8 @@
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
++ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+@@ -12480,7 +12483,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/msw/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+diff -Naur wxPython-src-2.8.12.1.orig/src/common/intl.cpp wxPython-src-2.8.12.1/src/common/intl.cpp
+--- wxPython-src-2.8.12.1.orig/src/common/intl.cpp 2014-01-04 22:28:16.675106608 -0500
++++ wxPython-src-2.8.12.1/src/common/intl.cpp 2014-01-04 22:47:49.523526232 -0500
+@@ -1597,7 +1597,7 @@
+ bool bOk = true;
+ if ( bLoadDefault )
+ {
+- bOk = AddCatalog(wxT("wxstd"));
++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)));
+
+ // there may be a catalog with toolkit specific overrides, it is not
+ // an error if this does not exist
+diff -Naur wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in wxPython-src-2.8.12.1/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in 2014-01-04 22:28:16.335109635 -0500
++++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in 2014-01-04 22:37:34.410068493 -0500
+@@ -120,7 +120,6 @@
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)