Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Tue May 23 20:56:11 2017 +0200
Changeset: 0f0b1e8148bdf77318b6fbe5570b23aa5b04bcd0
Modified Files:
Makefile
Added Files:
midori/DESCR
midori/Makefile
midori/PLIST
midori/distinfo
midori/patches/patch-CMakeLists.txt
midori/patches/patch-config_CMakeLists.txt
Log Message:
midori: Import midori-0.5.11nb14 as wip/midori
Midori is a lightweight web browser.
Features
Full integration with GTK+ 2
Fast rendering with WebKit
Tabs, windows and session management
Bookmarks with XBEL and token support
Flexibly configurable Web Searchbox
Custom context menu actions
User scripts and user styles support
Extensible via Javascript
XXX: Based on www/midori but adjusted in order to work with wip/webkit-gtk.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0f0b1e8148bdf77318b6fbe5570b23aa5b04bcd0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
midori/DESCR | 11 +++
midori/Makefile | 61 ++++++++++++
midori/PLIST | 149 +++++++++++++++++++++++++++++
midori/distinfo | 8 ++
midori/patches/patch-CMakeLists.txt | 45 +++++++++
midori/patches/patch-config_CMakeLists.txt | 23 +++++
7 files changed, 298 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 035b642028..0eb5e07ac6 100644
--- a/Makefile
+++ b/Makefile
@@ -1936,6 +1936,7 @@ SUBDIR+= microblog-purple
SUBDIR+= microcom
SUBDIR+= microtetris
SUBDIR+= mid2gmc
+SUBDIR+= midori
SUBDIR+= milou
SUBDIR+= milter-greylist-devel
SUBDIR+= mime-support
diff --git a/midori/DESCR b/midori/DESCR
new file mode 100644
index 0000000000..90aebe5a45
--- /dev/null
+++ b/midori/DESCR
@@ -0,0 +1,11 @@
+Midori is a lightweight web browser.
+
+Features
+ Full integration with GTK+ 2
+ Fast rendering with WebKit
+ Tabs, windows and session management
+ Bookmarks with XBEL and token support
+ Flexibly configurable Web Searchbox
+ Custom context menu actions
+ User scripts and user styles support
+ Extensible via Javascript
diff --git a/midori/Makefile b/midori/Makefile
new file mode 100644
index 0000000000..5c9ebe4fde
--- /dev/null
+++ b/midori/Makefile
@@ -0,0 +1,61 @@
+# $NetBSD: Makefile,v 1.98 2017/04/22 21:04:02 adam Exp $
+
+DISTNAME= midori_0.5.11_all_
+PKGNAME= ${DISTNAME:S/_all_//:S/_/-/}
+PKGREVISION= 14
+CATEGORIES= www
+MASTER_SITES= http://midori-browser.org/downloads/
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://midori-browser.org/
+COMMENT= Lightweight web browser using WebKit
+LICENSE= gnu-lgpl-v2.1
+EXTRACT_SUFX= .tar.bz2
+
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+
+USE_CMAKE= yes
+USE_TOOLS+= gmake intltool msgfmt pkg-config
+
+CMAKE_ARGS+= -DPREFIX=${PREFIX}
+CMAKE_ARGS+= -DUSE_ZEITGEIST=OFF
+CMAKE_ARGS+= -DUSE_GTK3=ON
+CMAKE_ARGS+= -DHALF_BRO_INCOM_WEBKIT2:BOOL=ON
+
+CHECK_PORTABILITY_SKIP+= win32/old/x86-mingw32-opensuse/install.sh
+CHECK_PORTABILITY_SKIP+= win32/makedist/makedist.midori
+
+BUILD_DEPENDS+= librsvg>=2.18:../../graphics/librsvg
+
+DEPENDS+= gnome-themes-[0-9]*:../../x11/gnome-themes
+
+EGDIR= ${PREFIX}/share/examples/midori
+OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/midori
+CONF_FILES= ${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
+
+.include "../../mk/bsd.prefs.mk"
+
+OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock
+CONF_FILES+= ${EGDIR}/extensions/adblock/config \
+ ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock/config
+
+CONFIGURE_ENV= VALAC=${VALAC}
+
+NOT_PAX_MPROTECT_SAFE+= bin/midori
+
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
+#.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../wip/webkit-gtk/buildlink3.mk"
+BUILDLINK_DEPMETHOD.vala= build
+.include "../../lang/vala/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/midori/PLIST b/midori/PLIST
new file mode 100644
index 0000000000..f53804d1fc
--- /dev/null
+++ b/midori/PLIST
@@ -0,0 +1,149 @@
+@comment $NetBSD$
+bin/midori
+lib/libmidori-core.so
+lib/libmidori-core.so.0.0.0
+lib/libmidori-core.so.1
+lib/midori/libabout.so
+lib/midori/libadblock.so
+lib/midori/libapps.so
+lib/midori/libcolorful-tabs.so
+lib/midori/libcookie-manager.so
+lib/midori/libcopy-tabs.so
+lib/midori/libdelayed-load.so
+lib/midori/libdevpet.so
+lib/midori/libdomain-keys.so
+lib/midori/libfeed-panel.so
+lib/midori/libflummi.so
+lib/midori/libhistory-list.so
+lib/midori/libmouse-gestures.so
+lib/midori/libnotes.so
+lib/midori/libopen-with.so
+lib/midori/libshortcuts.so
+lib/midori/libstatus-clock.so
+lib/midori/libstatusbar-features.so
+lib/midori/libtab-panel.so
+lib/midori/libtabby.so
+lib/midori/libtabs-minimized.so
+lib/midori/libtoolbar-editor.so
+lib/midori/libtransfers.so
+lib/midori/libwebmedia-now-playing.so
+share/appdata/midori.appdata.xml
+share/applications/midori-private.desktop
+share/applications/midori.desktop
+share/doc/midori/AUTHORS
+share/doc/midori/COPYING
+share/doc/midori/ChangeLog
+share/doc/midori/EXPAT
+share/doc/midori/README
+share/doc/midori/faq.css
+share/doc/midori/faq.html
+share/examples/midori/extensions/adblock/config
+share/examples/midori/search
+share/icons/hicolor/16x16/apps/midori.png
+share/icons/hicolor/16x16/categories/extension.png
+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
+share/locale/af/LC_MESSAGES/midori.mo
+share/locale/am/LC_MESSAGES/midori.mo
+share/locale/ar/LC_MESSAGES/midori.mo
+share/locale/ast/LC_MESSAGES/midori.mo
+share/locale/be/LC_MESSAGES/midori.mo
+share/locale/bg/LC_MESSAGES/midori.mo
+share/locale/bn/LC_MESSAGES/midori.mo
+share/locale/bs/LC_MESSAGES/midori.mo
+share/locale/ca/LC_MESSAGES/midori.mo
+share/locale/ckb/LC_MESSAGES/midori.mo
+share/locale/cs/LC_MESSAGES/midori.mo
+share/locale/cy/LC_MESSAGES/midori.mo
+share/locale/da/LC_MESSAGES/midori.mo
+share/locale/de/LC_MESSAGES/midori.mo
+share/locale/el/LC_MESSAGES/midori.mo
+share/locale/en_AU/LC_MESSAGES/midori.mo
+share/locale/en_CA/LC_MESSAGES/midori.mo
+share/locale/en_GB/LC_MESSAGES/midori.mo
+share/locale/eo/LC_MESSAGES/midori.mo
+share/locale/es/LC_MESSAGES/midori.mo
+share/locale/et/LC_MESSAGES/midori.mo
+share/locale/eu/LC_MESSAGES/midori.mo
+share/locale/fa/LC_MESSAGES/midori.mo
+share/locale/fi/LC_MESSAGES/midori.mo
+share/locale/fr/LC_MESSAGES/midori.mo
+share/locale/gd/LC_MESSAGES/midori.mo
+share/locale/gl/LC_MESSAGES/midori.mo
+share/locale/he/LC_MESSAGES/midori.mo
+share/locale/hi/LC_MESSAGES/midori.mo
+share/locale/hr/LC_MESSAGES/midori.mo
+share/locale/hu/LC_MESSAGES/midori.mo
+share/locale/ia/LC_MESSAGES/midori.mo
+share/locale/id/LC_MESSAGES/midori.mo
+share/locale/it/LC_MESSAGES/midori.mo
+share/locale/ja/LC_MESSAGES/midori.mo
+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
+share/locale/ms/LC_MESSAGES/midori.mo
+share/locale/nap/LC_MESSAGES/midori.mo
+share/locale/nb/LC_MESSAGES/midori.mo
+share/locale/nl/LC_MESSAGES/midori.mo
+share/locale/nn/LC_MESSAGES/midori.mo
+share/locale/no/LC_MESSAGES/midori.mo
+share/locale/pa/LC_MESSAGES/midori.mo
+share/locale/pl/LC_MESSAGES/midori.mo
+share/locale/pt/LC_MESSAGES/midori.mo
+share/locale/pt_BR/LC_MESSAGES/midori.mo
+share/locale/ro/LC_MESSAGES/midori.mo
+share/locale/ru/LC_MESSAGES/midori.mo
+share/locale/sk/LC_MESSAGES/midori.mo
+share/locale/sl/LC_MESSAGES/midori.mo
+share/locale/sq/LC_MESSAGES/midori.mo
+share/locale/sr/LC_MESSAGES/midori.mo
+share/locale/sr@latin/LC_MESSAGES/midori.mo
+share/locale/sv/LC_MESSAGES/midori.mo
+share/locale/ta/LC_MESSAGES/midori.mo
+share/locale/te/LC_MESSAGES/midori.mo
+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/element_hider.js
+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/error.html
+share/midori/res/flummi/Create.sql
+share/midori/res/forms/Create.sql
+share/midori/res/gtk3.css
+share/midori/res/history/Create.sql
+share/midori/res/history/Day.sql
+share/midori/res/logo-shade.png
+share/midori/res/nojs/nojs-statusicon-allowed.png
+share/midori/res/nojs/nojs-statusicon-denied.png
+share/midori/res/nojs/nojs-statusicon-mixed.png
+share/midori/res/notes/Create.sql
+share/midori/res/speeddial-head.html
+share/midori/res/tabby/Create.sql
+share/midori/res/tabby/Update1.sql
diff --git a/midori/distinfo b/midori/distinfo
new file mode 100644
index 0000000000..bf49b25d66
--- /dev/null
+++ b/midori/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.25 2015/10/25 13:50:22 jmcneill Exp $
+
+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
diff --git a/midori/patches/patch-CMakeLists.txt b/midori/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..2304a02b6d
--- /dev/null
+++ b/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/midori/patches/patch-config_CMakeLists.txt b/midori/patches/patch-config_CMakeLists.txt
new file mode 100644
index 0000000000..90dad68648
--- /dev/null
+++ b/midori/patches/patch-config_CMakeLists.txt
@@ -0,0 +1,23 @@
+$NetBSD: patch-config_CMakeLists.txt,v 1.1 2014/12/02 10:07:24 snj Exp $
+
+Put config files to examples dir.
+
+--- config/CMakeLists.txt.orig 2014-11-10 15:30:22.000000000 -0800
++++ config/CMakeLists.txt 2014-12-01 23:04:42.000000000 -0800
+@@ -10,14 +10,5 @@ if (${CMAKE_INSTALL_PREFIX} STREQUAL "/u
+ set(CMAKE_INSTALL_SYSCONFDIR "/etc")
+ endif()
+
+-foreach (FILE ${CONFIG_FILES})
+- string (FIND ${FILE} "adblock" ADBLOCK_CONF)
+- if (ADBLOCK_CONF GREATER -1)
+- string (REPLACE "config" "" dirname ${FILE})
+- install (FILES ${FILE}
+- DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${XDG_CONFIG_DIR}/${dirname}")
+- else ()
+- install (FILES ${FILE}
+- DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${XDG_CONFIG_DIR}")
+- endif ()
+-endforeach ()
++install (FILES "search" DESTINATION "${PREFIX}/share/examples/midori")
++install (FILES "extensions/adblock/config" DESTINATION "${PREFIX}/share/examples/midori/extensions/adblock")