aboutsummaryrefslogtreecommitdiffstats
path: root/x11/midori
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-05-07 19:43:23 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-05-07 19:43:23 +0000
commit533a093faab0c24e98e0df21b92fb4dfdbf2bee3 (patch)
tree76c22d3ceb03765ec2fa93ca5682e6e55de3da09 /x11/midori
parentbf1e25d5b50d07f8e7bd767e2d02f75cf9e094ae (diff)
downloadaports-533a093faab0c24e98e0df21b92fb4dfdbf2bee3.tar.bz2
aports-533a093faab0c24e98e0df21b92fb4dfdbf2bee3.tar.xz
x11/midori: upgrade to 0.1.6
Diffstat (limited to 'x11/midori')
-rw-r--r--x11/midori/APKBUILD10
-rw-r--r--x11/midori/midori-0.1.5-fpic.patch53
2 files changed, 2 insertions, 61 deletions
diff --git a/x11/midori/APKBUILD b/x11/midori/APKBUILD
index 4c1d7ea9e3..e41f1249e1 100644
--- a/x11/midori/APKBUILD
+++ b/x11/midori/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=midori
-pkgver=0.1.5
+pkgver=0.1.6
pkgrel=0
pkgdesc="A lightweight web browser based on Gtk WebKit"
url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -26,16 +26,11 @@ makedepends="
"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2
- midori-0.1.5-fpic.patch
$install"
build ()
{
cd "$srcdir"/$pkgname-$pkgver
- for i in ../*.patch; do
- msg "Applying $i..."
- patch -p1 < $i || return 1
- done
./configure --prefix=/usr \
--jobs=${MAKEFLAGS/-j/} \
--enable-libidn \
@@ -48,8 +43,7 @@ build ()
make || return 1
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="dccaddeb49d7def8a19cf497cb7eabf8 midori-0.1.5.tar.bz2
-8f36ef6716f2fc8ae9924471f3647e94 midori-0.1.5-fpic.patch
+md5sums="afed64074b2ed195aae171b2178650e1 midori-0.1.6.tar.bz2
a373e86256d1cd179791e486d2862d44 midori.post-install
a373e86256d1cd179791e486d2862d44 midori.post-upgrade
e962d246f1861faf94b70b37b0d3ef66 midori.post-deinstall"
diff --git a/x11/midori/midori-0.1.5-fpic.patch b/x11/midori/midori-0.1.5-fpic.patch
deleted file mode 100644
index 82dc761dde..0000000000
--- a/x11/midori/midori-0.1.5-fpic.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ed2a35d70b78232562aeb1ba0158fe785916c96b Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian@twotoasts.de>
-Date: Sun, 29 Mar 2009 22:14:43 +0000
-Subject: Don't expressly use libkatze in extensions to avoid -fPIC problem
-
----
-diff --git a/extensions/wscript_build b/extensions/wscript_build
-index 8ce7027..1ea845d 100644
---- a/extensions/wscript_build
-+++ b/extensions/wscript_build
-@@ -26,5 +26,4 @@ for extension in extensions:
- obj.includes = '..'
- obj.source = source
- obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
-- obj.uselib_local = 'katze'
- obj.install_path = '${LIBDIR}/midori'
-diff --git a/katze/wscript_build b/katze/wscript_build
-index 27a24fc..52c282d 100644
---- a/katze/wscript_build
-+++ b/katze/wscript_build
-@@ -12,6 +12,3 @@ obj.find_sources_in_dirs ('.')
- obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal')
- obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML'
- obj.install_path = None
--
--if platform.architecture ()[0] == '64bit':
-- obj.env.append_value ('CCFLAGS', '-fPIC')
-diff --git a/midori/wscript_build b/midori/wscript_build
-index 91f5302..87eba0e 100644
---- a/midori/wscript_build
-+++ b/midori/wscript_build
-@@ -14,9 +14,6 @@ obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML HILDON'
- obj.uselib_local = 'katze'
- obj.install_path = None
-
--if platform.architecture ()[0] == '64bit':
-- obj.env.append_value ('CCFLAGS', '-fPIC')
--
- obj = bld.new_task_gen ('cc', 'staticlib')
- obj.name = 'panels'
- obj.target = 'panels'
-@@ -26,9 +23,6 @@ obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
- obj.uselib_local = 'midori'
- obj.install_path = None
-
--if platform.architecture ()[0] == '64bit':
-- obj.env.append_value ('CCFLAGS', '-fPIC')
--
- obj = bld.new_task_gen ('cc', 'program')
- obj.target = 'midori'
- obj.includes = '. .. ../panels'
---
-cgit v0.8.2-1-g6063