Update to otter-browser, a few commits beyond 0.9.05.

From Adam Wolk, plist regen by me and OK with Adam.
This commit is contained in:
sthen 2015-04-05 14:35:57 +00:00
parent e8691ea813
commit 7238d21ca8
4 changed files with 47 additions and 61 deletions

View File

@ -1,15 +1,29 @@
# $OpenBSD: Makefile,v 1.4 2015/04/05 13:13:38 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2015/04/05 14:35:57 sthen Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
COMMENT = browser aiming to recreate classic Opera (12.x) UI using Qt5
GH_ACCOUNT = OtterBrowser
GH_PROJECT = otter-browser
V = 0.9.04
V = 0.9.05
#GH_TAGNAME = v$V
# We were asked by upstream to release from the following commit instead of
# the tag as it's considered an important fix affecting the majority of users.
GH_COMMIT = 23d7ee6f9cd636e750687a01975b177c1c9c2e53
# We were asked by upstream to release from the following commit
# as it contains fixes for crashes & serious issues
# - Adhere to cppcheck reports
# - #767 Browser isn't starting after "Toolbars > Reset to Defaults..."
# - Crash when cloning tab
# - #768 "Navigation Bar > Remove..." is not working
# - Escape ampersand for TabBarWidget
# - #769 Transfer completed notification was triggered on download stop
# - Fix check that could prevent configuration or removal of custom
# toolbars
# - Small code refactorizations
# - Prevent crashes in modal dialog for cookie saving when more then
# one is already stored
# - #779 build warning fixes (was not present in release code)
# - #190 Initial work for storing session data
# - Ensuring that bookmarks model always emits signals on modification
GH_COMMIT = 1ea5df13f908495df4ccccad9d634d997f6fd4c9
DISTNAME = ${GH_PROJECT}-$Vpl0

View File

@ -1,2 +1,2 @@
SHA256 (otter-browser-0.9.04pl0.tar.gz) = RBi2ulzkWN/9VG5AqA440i4oyAiqPzakcZLSKD8bCD0=
SIZE (otter-browser-0.9.04pl0.tar.gz) = 1830162
SHA256 (otter-browser-0.9.05pl0.tar.gz) = biN8KBDS+XzAhg6WLEciNBwMtP2RXq7XZKatcIlgZvE=
SIZE (otter-browser-0.9.05pl0.tar.gz) = 2304783

View File

@ -1,56 +1,23 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2015/01/24 23:10:36 zhuk Exp $
--- CMakeLists.txt.orig Tue Jan 13 16:11:08 2015
+++ CMakeLists.txt Tue Jan 13 16:12:16 2015
@@ -31,20 +31,20 @@ if (EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
set(CPACK_COMPONENTS_ALL Libraries ApplicationData)
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
${CMAKE_INSTALL_PREFIX}/share/applications
- /usr/share/icons
- /usr/share/icons/hicolor
- /usr/share/icons/hicolor/16x16
- /usr/share/icons/hicolor/32x32
- /usr/share/icons/hicolor/48x48
- /usr/share/icons/hicolor/64x64
- /usr/share/icons/hicolor/128x128
- /usr/share/icons/hicolor/256x256
- /usr/share/icons/hicolor/16x16/apps
- /usr/share/icons/hicolor/32x32/apps
- /usr/share/icons/hicolor/48x48/apps
- /usr/share/icons/hicolor/64x64/apps
- /usr/share/icons/hicolor/128x128/apps
- /usr/share/icons/hicolor/256x256/apps
+ ${CMAKE_INSTALL_PREFIX}/share/icons
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps
+ ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps
)
$OpenBSD: patch-CMakeLists_txt,v 1.2 2015/04/05 14:35:57 sthen Exp $
--- CMakeLists.txt.orig Sat Apr 4 19:07:35 2015
+++ CMakeLists.txt Sun Apr 5 15:08:39 2015
@@ -12,9 +12,9 @@ project(otter-browser)
include(CPack)
@@ -235,11 +235,11 @@ foreach(_current_QM_FILE ${_qm_files})
install(FILES ${_current_QM_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/otter-browser/locale/)
endforeach(_current_QM_FILE)
set(MAJOR_VERSION "0")
set(MINOR_VERSION "9")
-set(PATCH_VERSION "06")
-set(OTTER_VERSION_MAIN "0.9.06")
-set(OTTER_VERSION_CONTEXT "-dev")
+set(PATCH_VERSION "05")
+set(OTTER_VERSION_MAIN "0.9.05")
+set(OTTER_VERSION_CONTEXT " beta 5")
-install(FILES resources/icons/otter-browser-16.png DESTINATION /usr/share/icons/hicolor/16x16/apps/ RENAME otter-browser.png)
-install(FILES resources/icons/otter-browser-32.png DESTINATION /usr/share/icons/hicolor/32x32/apps/ RENAME otter-browser.png)
-install(FILES resources/icons/otter-browser-48.png DESTINATION /usr/share/icons/hicolor/48x48/apps/ RENAME otter-browser.png)
-install(FILES resources/icons/otter-browser-64.png DESTINATION /usr/share/icons/hicolor/64x64/apps/ RENAME otter-browser.png)
-install(FILES resources/icons/otter-browser-128.png DESTINATION /usr/share/icons/hicolor/128x128/apps/ RENAME otter-browser.png)
-install(FILES resources/icons/otter-browser-256.png DESTINATION /usr/share/icons/hicolor/256x256/apps/ RENAME otter-browser.png)
+install(FILES resources/icons/otter-browser-16.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps/ RENAME otter-browser.png)
+install(FILES resources/icons/otter-browser-32.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps/ RENAME otter-browser.png)
+install(FILES resources/icons/otter-browser-48.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/ RENAME otter-browser.png)
+install(FILES resources/icons/otter-browser-64.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps/ RENAME otter-browser.png)
+install(FILES resources/icons/otter-browser-128.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/ RENAME otter-browser.png)
+install(FILES resources/icons/otter-browser-256.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps/ RENAME otter-browser.png)
if (EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
include(InstallRequiredSystemLibraries)
@@ -312,5 +312,5 @@ install(FILES resources/icons/otter-browser-64.png DES
install(FILES resources/icons/otter-browser-128.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/ RENAME otter-browser.png)
install(FILES resources/icons/otter-browser-256.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps/ RENAME otter-browser.png)
install(FILES otter-browser.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(TARGETS otter-browser DESTINATION bin)
-install(FILES man/otter-browser.1 DESTINATION share/man/man1/)
+install(FILES man/otter-browser.1 DESTINATION man/man1/)
install(TARGETS otter-browser DESTINATION bin/)

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/01/24 23:10:36 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.2 2015/04/05 14:35:57 sthen Exp $
@bin bin/otter-browser
@man man/man1/otter-browser.1
share/applications/otter-browser.desktop
share/icons/hicolor/128x128/apps/otter-browser.png
share/icons/hicolor/16x16/apps/otter-browser.png
@ -9,15 +10,19 @@ share/icons/hicolor/48x48/apps/otter-browser.png
share/icons/hicolor/64x64/apps/otter-browser.png
share/otter-browser/
share/otter-browser/locale/
share/otter-browser/locale/otter-browser_ca_ES.qm
share/otter-browser/locale/otter-browser_cs_CZ.qm
share/otter-browser/locale/otter-browser_da.qm
share/otter-browser/locale/otter-browser_de_DE.qm
share/otter-browser/locale/otter-browser_el.qm
share/otter-browser/locale/otter-browser_en_CA.qm
share/otter-browser/locale/otter-browser_en_GB.qm
share/otter-browser/locale/otter-browser_en_US.qm
share/otter-browser/locale/otter-browser_es_ES.qm
share/otter-browser/locale/otter-browser_es_MX.qm
share/otter-browser/locale/otter-browser_et.qm
share/otter-browser/locale/otter-browser_fi.qm
share/otter-browser/locale/otter-browser_fr_CA.qm
share/otter-browser/locale/otter-browser_fr_FR.qm
share/otter-browser/locale/otter-browser_hu.qm
share/otter-browser/locale/otter-browser_id_ID.qm