diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
| commit | 0ee0392ee9301df31f6e3c601214bb250112fa75 (patch) | |
| tree | 3d91576bf751a8a45ddad77e0a37c2d8fd4fa91f /community/midori/0001-Fix-libsoup-version-check-defines.patch | |
| parent | a3ba265c32b1de731745e1abc812f5d21bcd6aaf (diff) | |
| parent | 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dwdiff/PKGBUILD
community/ejabberd/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gpicview/PKGBUILD
community/libgexiv2/PKGBUILD
community/mapnik/PKGBUILD
community/mplayer2/PKGBUILD
community/open-vm-tools/PKGBUILD
community/vdrift/PKGBUILD
community/xboard/PKGBUILD
core/openssh/PKGBUILD
extra/boost/PKGBUILD
extra/dconf/PKGBUILD
extra/elfutils/PKGBUILD
extra/gconf/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-themes-standard/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/icu/PKGBUILD
extra/libgsf/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libplist/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/pango/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/telepathy-kde-accounts-kcm/PKGBUILD
extra/telepathy-kde-approver/PKGBUILD
extra/telepathy-kde-auth-handler/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/telepathy-kde-filetransfer-handler/PKGBUILD
extra/telepathy-kde-integration-module/PKGBUILD
extra/telepathy-kde-send-file/PKGBUILD
extra/telepathy-kde-text-ui/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/virtuoso/PKGBUILD
extra/yelp/PKGBUILD
libre/unarchiver/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/binutils/PKGBUILD
Diffstat (limited to 'community/midori/0001-Fix-libsoup-version-check-defines.patch')
| -rw-r--r-- | community/midori/0001-Fix-libsoup-version-check-defines.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/community/midori/0001-Fix-libsoup-version-check-defines.patch b/community/midori/0001-Fix-libsoup-version-check-defines.patch new file mode 100644 index 000000000..2debc92fe --- /dev/null +++ b/community/midori/0001-Fix-libsoup-version-check-defines.patch @@ -0,0 +1,28 @@ +From c7c172f7ffc9316be5954c920654e1deb9f470b7 Mon Sep 17 00:00:00 2001 +From: Christian Dywan <christian@twotoasts.de> +Date: Mon, 16 Apr 2012 17:17:23 +0000 +Subject: Fix libsoup version check #defines + +Fixes: https://bugs.launchpad.net/midori/+bug/983137 +--- +diff --git a/wscript b/wscript +index db74324..c7a0c87 100644 +--- a/wscript ++++ b/wscript +@@ -260,11 +260,11 @@ def configure (conf): + check_pkg ('libsoup-2.4', '2.27.90') + conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4')) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3): +- conf.define ('LIBSOUP_2_29_3', 1) ++ conf.define ('HAVE_LIBSOUP_2_29_3', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91): +- conf.define ('LIBSOUP_2_29_91', 1) ++ conf.define ('HAVE_LIBSOUP_2_29_91', 1) + if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1): +- conf.define ('LIBSOUP_2_37_1', 1) ++ conf.define ('HAVE_LIBSOUP_2_37_1', 1) + check_pkg ('libxml-2.0', '2.6') + check_pkg ('sqlite3', '3.0', True, var='SQLITE') + +-- +cgit v0.9.0.3 |