diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2016-04-29 10:46:09 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-04-30 19:10:07 +0200 |
| commit | 54bbd88b1f0c4de25688dae1d0c30d222722feb4 (patch) | |
| tree | a51569e3febec5bd92fe07cb23adb45490eb7564 /package/midori/0001-disable-libnotify.patch | |
| parent | 1f5bb4454474886a2e321ab59f71bdc919516312 (diff) | |
| download | buildroot-54bbd88b1f0c4de25688dae1d0c30d222722feb4.tar.gz buildroot-54bbd88b1f0c4de25688dae1d0c30d222722feb4.zip | |
midori: bump to version 0.5.11
Also drop BR2_PACKAGE_MIDORI_HTTPS option since it's now handled in the
webkitgtk package to satisfy MiniBrowser.
This version can't work with the older webkitgtk24 engine so it switches
to the new version.
Also make gcr support conditional on x11 support for libgtk3, it doesn't
work otherwise.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/midori/0001-disable-libnotify.patch')
| -rw-r--r-- | package/midori/0001-disable-libnotify.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/package/midori/0001-disable-libnotify.patch b/package/midori/0001-disable-libnotify.patch deleted file mode 100644 index 830ecff5e8..0000000000 --- a/package/midori/0001-disable-libnotify.patch +++ /dev/null @@ -1,43 +0,0 @@ -Disable libnotify support, we've got no package and it's not very useful -in embedded targets anyway. -The webmedia extension requires libnotify as well. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura midori-0.5.9.orig/CMakeLists.txt midori-0.5.9/CMakeLists.txt ---- midori-0.5.9.orig/CMakeLists.txt 2015-03-30 15:57:29.554632932 -0300 -+++ midori-0.5.9/CMakeLists.txt 2015-03-30 15:57:35.299830192 -0300 -@@ -143,16 +143,7 @@ - endif () - endif () - --if (WIN32) -- add_definitions("-DLIBNOTIFY_VERSION=\"No\"") --else () -- pkg_check_modules(NOTIFY REQUIRED libnotify) -- add_definitions("-DLIBNOTIFY_VERSION=\"${NOTIFY_VERSION}\"") -- add_definitions("-DHAVE_LIBNOTIFY") -- set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${NOTIFY_INCLUDE_DIRS}") -- set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${NOTIFY_LIBRARIES}") -- set(PKGS ${PKGS} libnotify) --endif () -+add_definitions("-DLIBNOTIFY_VERSION=\"No\"") - - option(USE_GTK3 "Use GTK+3" OFF) - option(HALF_BRO_INCOM_WEBKIT2 "Serve as a guniea pig" OFF) -diff -Nura midori-0.5.9.orig/extensions/CMakeLists.txt midori-0.5.9/extensions/CMakeLists.txt ---- midori-0.5.9.orig/extensions/CMakeLists.txt 2015-03-30 15:57:29.544632589 -0300 -+++ midori-0.5.9/extensions/CMakeLists.txt 2015-03-30 15:57:51.777395949 -0300 -@@ -24,11 +24,7 @@ - ) - endif () - --# FIXME: re-enable webmedia extension --# once we have working notifications on win --if (WIN32) -- list(REMOVE_ITEM EXTENSIONS "webmedia-now-playing.vala") --endif() -+list(REMOVE_ITEM EXTENSIONS "webmedia-now-playing.vala") - - foreach(UNIT_SRC ${EXTENSIONS}) - string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION) |
