From 217f5326a654bb107959fbe942ac34a4dd8df224 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 19 Jul 2012 18:16:36 +0000
Subject: testing/wxformbuilder: upgrade to 3.1.70

---
 testing/wxformbuilder/APKBUILD                     |  13 +++++++-----
 testing/wxformbuilder/icon_48x48_wxformbuilder.png | Bin 0 -> 4650 bytes
 testing/wxformbuilder/libdl.patch                  |  22 ++++++++++-----------
 3 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 testing/wxformbuilder/icon_48x48_wxformbuilder.png

(limited to 'testing')

diff --git a/testing/wxformbuilder/APKBUILD b/testing/wxformbuilder/APKBUILD
index c14d6b71d..cc486c477 100644
--- a/testing/wxformbuilder/APKBUILD
+++ b/testing/wxformbuilder/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wxformbuilder
-pkgver=3.0.57
+pkgver=3.1.70
 pkgrel=0
 pkgdesc="RAD tool for wxWidgets GUI design"
 url="http://sourceforge.net/apps/wordpress/wxformbuilder"
@@ -12,10 +12,10 @@ depends_dev=""
 makedepends="$depends_dev wxgtk-dev"
 install=""
 subpackages=""
-source="http://downloads.sourceforge.net/project/wxformbuilder/wxformbuilder-src/$pkgver/wxformbuilder-$pkgver.tar.gz
+source="http://downloads.sourceforge.net/project/wxformbuilder/wxformbuilder/$pkgver/wxFormBuilder_v${pkgver}-src.tar.bz2
 	libdl.patch"
 
-_builddir="$srcdir"/wxformbuilder_$pkgver
+_builddir="$srcdir"/wxformbuilder
 prepare() {
 	local i
 	cd "$_builddir"
@@ -24,10 +24,13 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	sed -i -e 's/\r//' create_build_files.sh \
+		install/linux/wxfb_export.sh
 }
 
 build() {
 	cd "$_builddir"
+	./create_build_files.sh || return 1
 	make CONFIG=Release || return 1
 }
 
@@ -37,5 +40,5 @@ package() {
 	install/linux/wxfb_export.sh "$pkgdir"/usr || return 1
 }
 
-md5sums="77dd368b2ec4ec5a583e1ab60c344a12  wxformbuilder-3.0.57.tar.gz
-a4917ec9c4afbb848a07e6a44f6c4924  libdl.patch"
+md5sums="1c2d53a344333bd2389f9f07a5321d5e  wxFormBuilder_v3.1.70-src.tar.bz2
+304bb4f7dd668fd42abc7d9ae986610a  libdl.patch"
diff --git a/testing/wxformbuilder/icon_48x48_wxformbuilder.png b/testing/wxformbuilder/icon_48x48_wxformbuilder.png
new file mode 100644
index 000000000..db33a0ade
Binary files /dev/null and b/testing/wxformbuilder/icon_48x48_wxformbuilder.png differ
diff --git a/testing/wxformbuilder/libdl.patch b/testing/wxformbuilder/libdl.patch
index cc0be82ae..41aa10e38 100644
--- a/testing/wxformbuilder/libdl.patch
+++ b/testing/wxformbuilder/libdl.patch
@@ -1,11 +1,11 @@
---- ./src/Makefile.orig
-+++ ./src/Makefile
-@@ -5,6 +5,8 @@
-   CONFIG=Release
- endif
- 
-+LDFLAGS += -ldl
-+
- ifeq ($(CONFIG),Release)
-   BINDIR := ../output/bin
-   LIBDIR := ..
+--- ./src/premake.lua.orig
++++ ./src/premake.lua
+@@ -58,7 +58,7 @@
+ 	package.libpaths = { "../output/lib/wxformbuilder", "../sdk/lib" }
+ end
+ -- Set the libraries it links to.
+-package.links = { "wxFlatNotebook", "wxPropGrid", "wxScintilla", "TiCPP", "plugin-interface" }
++package.links = { "wxFlatNotebook", "wxPropGrid", "wxScintilla", "TiCPP", "plugin-interface", "dl" }
+ 
+ -- Add libraries and build options for stack trace in MinGW
+ if ( windows and ( (string.find( target or "", ".*-gcc" )) or (target == "gnu") ) ) then
-- 
cgit v1.2.3