diff options
| -rw-r--r-- | x11/midori/APKBUILD | 55 | ||||
| -rw-r--r-- | x11/midori/midori-0.1.5-fpic.patch | 53 | ||||
| -rw-r--r-- | x11/midori/midori.post-deinstall | 5 | ||||
| -rw-r--r-- | x11/midori/midori.post-install | 4 | ||||
| l--------- | x11/midori/midori.post-upgrade | 1 |
5 files changed, 118 insertions, 0 deletions
diff --git a/x11/midori/APKBUILD b/x11/midori/APKBUILD new file mode 100644 index 00000000..4c1d7ea9 --- /dev/null +++ b/x11/midori/APKBUILD @@ -0,0 +1,55 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=midori +pkgver=0.1.5 +pkgrel=0 +pkgdesc="A lightweight web browser based on Gtk WebKit" +url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" +license="GPL" +depends=" + desktop-file-utils + gettext + hicolor-icon-theme + libidn + uclibc + webkit + " +makedepends=" + g++ + git + intltool + pkgconfig + python + gettext-dev + libidn-dev + libxml2-dev + webkit-dev + " +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 \ + --enable-sqlite \ + --enable-addons \ + --disable-hildon \ + --disable-unique \ + --enable-nls \ + || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="dccaddeb49d7def8a19cf497cb7eabf8 midori-0.1.5.tar.bz2 +8f36ef6716f2fc8ae9924471f3647e94 midori-0.1.5-fpic.patch +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 new file mode 100644 index 00000000..82dc761d --- /dev/null +++ b/x11/midori/midori-0.1.5-fpic.patch @@ -0,0 +1,53 @@ +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 diff --git a/x11/midori/midori.post-deinstall b/x11/midori/midori.post-deinstall new file mode 100644 index 00000000..00ebf0b3 --- /dev/null +++ b/x11/midori/midori.post-deinstall @@ -0,0 +1,5 @@ +#!/bin/sh + +update-desktop-database -q +gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor + diff --git a/x11/midori/midori.post-install b/x11/midori/midori.post-install new file mode 100644 index 00000000..9f24aeca --- /dev/null +++ b/x11/midori/midori.post-install @@ -0,0 +1,4 @@ +#!/bin/sh + +gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +update-desktop-database -q diff --git a/x11/midori/midori.post-upgrade b/x11/midori/midori.post-upgrade new file mode 120000 index 00000000..41bc70a9 --- /dev/null +++ b/x11/midori/midori.post-upgrade @@ -0,0 +1 @@ +midori.post-install
\ No newline at end of file |