summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/midori/Makefile8
-rw-r--r--www/midori/PLIST14
-rw-r--r--www/midori/distinfo11
-rw-r--r--www/midori/patches/patch-CMakeLists.txt45
-rw-r--r--www/midori/patches/patch-extensions_history-list.vala22
5 files changed, 62 insertions, 38 deletions
diff --git a/www/midori/Makefile b/www/midori/Makefile
index bd3ad6fd75d..7659a312370 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2015/10/25 11:53:24 jmcneill Exp $
+# $NetBSD: Makefile,v 1.85 2015/10/25 13:50:22 jmcneill Exp $
-DISTNAME= midori_0.5.9_all_
+DISTNAME= midori_0.5.11_all_
PKGNAME= ${DISTNAME:S/_all_//:S/_/-/}
-PKGREVISION= 5
CATEGORIES= www
MASTER_SITES= http://midori-browser.org/downloads/
@@ -42,9 +41,6 @@ CONF_FILES+= ${EGDIR}/extensions/adblock/config \
CONFIGURE_ENV= VALAC=${VALAC}
-pre-configure:
- ${RM} ${WRKSRC}/extensions/history-list.vala.orig
-
.include "options.mk"
.include "../../databases/sqlite3/buildlink3.mk"
diff --git a/www/midori/PLIST b/www/midori/PLIST
index ea6b60dc396..3fd12c9adc1 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2014/12/02 10:07:23 snj Exp $
+@comment $NetBSD: PLIST,v 1.27 2015/10/25 13:50:22 jmcneill Exp $
bin/midori
lib/libmidori-core.so
lib/libmidori-core.so.0.0.0
@@ -51,6 +51,9 @@ share/icons/hicolor/16x16/status/internet-news-reader.png
share/icons/hicolor/22x22/apps/midori.png
share/icons/hicolor/22x22/categories/extension.png
share/icons/hicolor/22x22/status/internet-news-reader.png
+share/icons/hicolor/24x24/status/adblock-blocked.svg
+share/icons/hicolor/24x24/status/adblock-disabled.svg
+share/icons/hicolor/24x24/status/adblock-enabled.svg
share/icons/hicolor/scalable/apps/midori.svg
share/icons/hicolor/scalable/categories/extension.svg
share/icons/hicolor/scalable/status/internet-news-reader.svg
@@ -93,7 +96,9 @@ share/locale/ka/LC_MESSAGES/midori.mo
share/locale/kk/LC_MESSAGES/midori.mo
share/locale/km/LC_MESSAGES/midori.mo
share/locale/ko/LC_MESSAGES/midori.mo
+share/locale/ku/LC_MESSAGES/midori.mo
share/locale/ky/LC_MESSAGES/midori.mo
+share/locale/lb/LC_MESSAGES/midori.mo
share/locale/lt/LC_MESSAGES/midori.mo
share/locale/lv/LC_MESSAGES/midori.mo
share/locale/ml/LC_MESSAGES/midori.mo
@@ -121,20 +126,19 @@ share/locale/th/LC_MESSAGES/midori.mo
share/locale/tr/LC_MESSAGES/midori.mo
share/locale/ug/LC_MESSAGES/midori.mo
share/locale/uk/LC_MESSAGES/midori.mo
+share/locale/ur/LC_MESSAGES/midori.mo
+share/locale/uz/LC_MESSAGES/midori.mo
share/locale/vi/LC_MESSAGES/midori.mo
share/locale/zh_CN/LC_MESSAGES/midori.mo
+share/locale/zh_HK/LC_MESSAGES/midori.mo
share/locale/zh_TW/LC_MESSAGES/midori.mo
share/midori/res/about.css
share/midori/res/adblock.list
-share/midori/res/adblock/blocked.png
-share/midori/res/adblock/disabled.png
share/midori/res/adblock/element_hider.js
-share/midori/res/adblock/enabled.png
share/midori/res/autosuggestcontrol.css
share/midori/res/autosuggestcontrol.js
share/midori/res/bookmarks/Create.sql
share/midori/res/bookmarks/Import_old_db_bookmarks.sql
-share/midori/res/close.png
share/midori/res/error.html
share/midori/res/flummi/Create.sql
share/midori/res/forms/Create.sql
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 7093dd69a1d..bf49b25d666 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.24 2015/04/24 11:23:05 joerg Exp $
+$NetBSD: distinfo,v 1.25 2015/10/25 13:50:22 jmcneill Exp $
-SHA1 (midori_0.5.9_all_.tar.bz2) = 475614dcc89a214a3c2fdc2aaefc817a5fa0ca03
-RMD160 (midori_0.5.9_all_.tar.bz2) = 0436382ed629bfce63a93b2645314f5a08f2b855
-Size (midori_0.5.9_all_.tar.bz2) = 1332192 bytes
+SHA1 (midori_0.5.11_all_.tar.bz2) = 64c86935028feb5f89d799c2acacaad67764da6f
+RMD160 (midori_0.5.11_all_.tar.bz2) = 66aaf624d39fbb86c1bec42972fba7998965ef50
+SHA512 (midori_0.5.11_all_.tar.bz2) = 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d
+Size (midori_0.5.11_all_.tar.bz2) = 1428791 bytes
+SHA1 (patch-CMakeLists.txt) = 68d0232b254e4094118b7f029162bf669f096d45
SHA1 (patch-config_CMakeLists.txt) = 5ac4af9f980749659058fb55e7fd25ad6226861f
-SHA1 (patch-extensions_history-list.vala) = 74959c33009040b33f34da1173c8114e82434399
diff --git a/www/midori/patches/patch-CMakeLists.txt b/www/midori/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..2304a02b6db
--- /dev/null
+++ b/www/midori/patches/patch-CMakeLists.txt
@@ -0,0 +1,45 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2015/10/25 13:50:22 jmcneill Exp $
+
+--- CMakeLists.txt.orig 2015-08-30 11:56:26.000000000 +0000
++++ CMakeLists.txt
+@@ -149,6 +149,7 @@ option(USE_GRANITE "Fancy notebook and p
+ option(USE_APIDOCS "API documentation" OFF)
+ option(USE_GIR "Generate GObject Introspection bindings" OFF)
+ option(EXTRA_WARNINGS "Additional compiler warnings" OFF)
++option(USE_GCR "Use GCR library" OFF)
+
+ # GTK+3 is implied here, whether set or not
+ if (USE_GRANITE OR HALF_BRO_INCOM_WEBKIT2)
+@@ -175,18 +176,22 @@ if (USE_ZEITGEIST)
+ set(PKGS ${PKGS} zeitgeist-2.0)
+ endif()
+
+-if (WIN32)
+- add_definitions("-DGCR_VERSION=\"No\"")
+-else ()
+- if (USE_GTK3)
+- pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
++if (USE_GCR)
++ if (WIN32)
++ add_definitions("-DGCR_VERSION=\"No\"")
+ else ()
+- pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32)
++ if (USE_GTK3)
++ pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
++ else ()
++ pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32)
++ endif ()
++ add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"")
++ add_definitions("-DHAVE_GCR")
++ set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS})
++ set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES})
+ endif ()
+- add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"")
+- add_definitions("-DHAVE_GCR")
+- set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS})
+- set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES})
++else ()
++ add_definitions("-DGCR_VERSION=\"No\"")
+ endif ()
+
+ if (HALF_BRO_INCOM_WEBKIT2)
diff --git a/www/midori/patches/patch-extensions_history-list.vala b/www/midori/patches/patch-extensions_history-list.vala
deleted file mode 100644
index bd1151fc6cf..00000000000
--- a/www/midori/patches/patch-extensions_history-list.vala
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-extensions_history-list.vala,v 1.1 2015/04/24 11:23:05 joerg Exp $
-
---- extensions/history-list.vala.orig 2015-04-23 18:29:27.000000000 +0000
-+++ extensions/history-list.vala
-@@ -319,7 +319,7 @@ namespace HistoryList {
- }
-
- private void create_widgets () {
-- ListStore model;
-+ Gtk.ListStore model;
- TreeIter iter;
- TreeIter? active_iter = null;
-
-@@ -331,7 +331,7 @@ namespace HistoryList {
-
- var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior");
-
-- model = new ListStore (2, typeof (string), typeof (int));
-+ model = new Gtk.ListStore (2, typeof (string), typeof (int));
-
- model.append (out iter);
- model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"),
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-20 09:53:26 +0000