diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-03-07 19:04:36 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-03-07 19:04:36 -0500 |
commit | 6b88978044968ed299d759bda64197302b564eac (patch) | |
tree | a5cb3bc77633731c6d1b3ab949d2fbe1f3cf35bd | |
parent | 090f888e57851a44d6db152c70bcd25d16ca548b (diff) | |
parent | 884d2257f61afaa40281776cdf78f3d866dcdad2 (diff) | |
download | abslibre-6b88978044968ed299d759bda64197302b564eac.tar.gz abslibre-6b88978044968ed299d759bda64197302b564eac.tar.bz2 abslibre-6b88978044968ed299d759bda64197302b564eac.zip |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
-rw-r--r-- | libre-testing/bibletime/PKGBUILD | 41 | ||||
-rw-r--r-- | libre-testing/bibletime/libre.patch | 46 | ||||
-rw-r--r-- | libre-testing/kde-development-environment-meta/PKGBUILD | 152 | ||||
-rw-r--r-- | libre-testing/kde-development-environment-meta/org.kde.development.appdata.xml | 33 | ||||
-rw-r--r-- | libre-testing/konqueror/PKGBUILD | 48 | ||||
-rw-r--r-- | libre-testing/konqueror/libre.patch | 55 |
6 files changed, 375 insertions, 0 deletions
diff --git a/libre-testing/bibletime/PKGBUILD b/libre-testing/bibletime/PKGBUILD new file mode 100644 index 000000000..91355030c --- /dev/null +++ b/libre-testing/bibletime/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 208912 2017-01-24 16:42:17Z felixonmars $ +# Maintainer: Felix Yan <felixonmars@archlinux.org> +# Maintainer: Alexander F Rødseth <xyproto@archlinux.org> +# Contributor: SanskritFritz (gmail) +# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=bibletime +pkgver=2.11.0 +pkgrel=1.parabola1 +pkgdesc='Bible study tool, with qt5-webkit-ng support' +arch=('x86_64' 'i686') +url='http://www.bibletime.info/' +license=('GPL2') +depends=('sword' 'clucene' 'qt5-webkit-ng' 'qt5-svg') +makedepends=('cmake' 'qt5-tools' 'git') +source=("git://github.com/bibletime/bibletime.git#tag=v$pkgver" + 'libre.patch') +md5sums=('SKIP' + '7364f533a5e4df5edecff95c172a8fc9') + +prepare() { + mkdir -p build + cd bibletime + patch -p1 -i ../libre.patch +} + +build() { + cd build + + cmake ../bibletime \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + make -C build DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre-testing/bibletime/libre.patch b/libre-testing/bibletime/libre.patch new file mode 100644 index 000000000..edbef3f8f --- /dev/null +++ b/libre-testing/bibletime/libre.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50c7391db..30a58e34f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,16 +150,6 @@ IF("${BIBLETIME_FRONTEND}" STREQUAL "MOBILE") + ADD_DEFINITIONS("-DBT_MOBILE") + ENDIF() + +-IF(Qt5Core_VERSION VERSION_LESS 5.6.0) +- SET(USEWEBENGINE OFF) +-ELSE() +- SET(USEWEBENGINE ON) +-ENDIF() +- +-IF(USEWEBENGINE) +- ADD_DEFINITIONS("-DUSEWEBENGINE") +-ENDIF() +- + # Define $bibletime_SOURCES + INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake") + +@@ -220,8 +210,6 @@ TARGET_LINK_LIBRARIES("bibletime" + + IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE") + qt5_use_modules("bibletime" Widgets WebKitWidgets Qml Quick Xml Network PrintSupport Svg) +-ELSEIF(USEWEBENGINE) +- qt5_use_modules("bibletime" Widgets WebEngine WebEngineWidgets WebChannel Xml Network PrintSupport Svg) + ELSE() + qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network PrintSupport Svg) + ENDIF() +@@ -276,13 +264,8 @@ INSTALL(FILES ${INSTALL_TMPL_LIST} + DESTINATION "${BT_SHARE_PATH}/bibletime/display-templates/") + + +-IF(USEWEBENGINE) +- INSTALL(FILES "src/frontend/display/btwebengine.js" +- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/") +-ELSE() +- INSTALL(FILES "src/frontend/display/bthtml.js" +- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/") +-ENDIF() ++INSTALL(FILES "src/frontend/display/bthtml.js" ++ DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/") + + INSTALL(FILES "docs/license.html" + DESTINATION "${BT_SHARE_PATH}/bibletime/license/") diff --git a/libre-testing/kde-development-environment-meta/PKGBUILD b/libre-testing/kde-development-environment-meta/PKGBUILD new file mode 100644 index 000000000..4b8b066a2 --- /dev/null +++ b/libre-testing/kde-development-environment-meta/PKGBUILD @@ -0,0 +1,152 @@ +# Note: This PKGBUILD is automatically generated by the scripts at https://cgit.kde.org/kdesdk-devenv-dependencies.git/ +# Don't manually edit the PKGBUILD, edit the upstream template instead + +pkgname=kde-development-environment-meta +pkgver=20170224 +pkgrel=1.parabola1 +pkgdesc='Metapackage to install a full KDE development environment, without nonfree qt5-webengine support' +arch=(any) +url='https://phabricator.kde.org/T3722' +license=(LGPL) +depends=(akonadi + akonadi-calendar + akonadi-contacts + akonadi-mime + akonadi-notes + akonadi-search + attica-qt5 + baloo + baloo-widgets + bash-completion + bluez-qt + calendarsupport + clang + cmake + eventviews + extra-cmake-modules + frameworkintegration + gcc + git + grantleetheme + incidenceeditor + kactivities + kactivities-stats + kalarmcal + karchive + kauth + kblog + kbookmarks + kcalcore + kcalutils + kcmutils + kcodecs + kcompletion + kconfig + kconfigwidgets + kcontacts + kcoreaddons + kcrash + kdbusaddons + kde-syndication + kdeclarative + kdelibs4support + kdepim-apps-libs + kdesignerplugin + kdesu + kdewebkit + kdnssd + kdoctools + kemoticons + kfilemetadata + kglobalaccel + kguiaddons + kholidays + khtml + ki18n + kiconthemes + kidentitymanagement + kidletime + kimap + kinit + kio + kirigami + kitemmodels + kitemviews + kjobwidgets + kjs + kjsembed + kldap + kmailtransport + kmbox + kmediaplayer + kmime + knewstuff + knotifications + knotifyconfig + konqueror + kontactinterface + kpackage + kparts + kpeople + kpimtextedit + kplotting + kpty + kross + krunner + kservice + ktexteditor + ktextwidgets + kunitconversion + kwallet + kwayland + kwidgetsaddons + kwindowsystem + kxmlgui + kxmlrpcclient + libgravatar + libkcddb + libkcompactdisc + libkdcraw + libkdegames + libkdepim + libkexiv2 + libkgapi + libkgeomap + libkipi + libkleo + libkmahjongg + libksane + libkscreen + libksieve + libksysguard + libktnef + libkvkontakte + libmediawiki + mailcommon + mailimporter + make + messagelib + modemmanager-qt + networkmanager-qt + ninja + pimcommon + plasma-framework + prison + qt5-base + qt5-declarative + solid + sonnet + syntax-highlighting + threadweaver) +optdepends=(kate + kdevelop + plasma-sdk + plasma-workspace) +makedepends=() +source=(org.kde.development.appdata.xml) +md5sums=('fb880c7f491576bd4a5c107f871a63d8') +noextract=() + +package() { + install -Dm644 org.kde.development.appdata.xml "$pkgdir"/usr/share/metainfo/org.kde.development.appdata.xml +} diff --git a/libre-testing/kde-development-environment-meta/org.kde.development.appdata.xml b/libre-testing/kde-development-environment-meta/org.kde.development.appdata.xml new file mode 100644 index 000000000..991d3de56 --- /dev/null +++ b/libre-testing/kde-development-environment-meta/org.kde.development.appdata.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> + +<component type="generic"> + <id>org.kde.development</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0+</project_license> + <name>KDE Development</name> + <icon type="stock">applications-development</icon> + <summary>A development environment for Qt and KDE Applications</summary> + <description> + <p>Install everything you need for a full KDE development system for developing your own software or extending existing one.</p> + <p>It will install all required dependencies for compiling most KDE software (Qt, KDE Frameworks, etc) and will offer to install the tools we've created to help the KDE development.</p> + </description> + + <screenshots> + <screenshot type="default"> + <image>https://www.kdevelop.org/sites/www.kdevelop.org/files/inline-images/kdevelop5-breeze_2.png</image> + </screenshot> + <screenshot> + <image>https://vizzzion.org/blog/wp-content/uploads/2015/02/cuttlefish.png</image> + </screenshot> + </screenshots> + + <suggests> + <id>org.kde.kate.desktop</id> + <id>org.kde.kdevelop.desktop</id> + <id>org.kde.plasma.themeexplorer.desktop</id> + <id>org.kde.plasma.lookandfeelexplorer.desktop</id> + </suggests> + + <url type="help">https://techbase.kde.org/Development/Tutorials</url> + <project_group>KDE</project_group> +</component> diff --git a/libre-testing/konqueror/PKGBUILD b/libre-testing/konqueror/PKGBUILD new file mode 100644 index 000000000..79dd7519f --- /dev/null +++ b/libre-testing/konqueror/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer (Arch): Antonio Rojas <arojas@archlinux,org> +# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> +# Maintainer: André Silva <emulatorman@parabola.nu> +# Contributor: Michał Masłowski <mtjm@mtjm.eu> + +pkgname=konqueror +pkgver=16.12.2 +pkgrel=1.parabola2 +pkgdesc="KDE File Manager & Web Browser, without Google, nonfree software recommendation and nonfree qt5-webengine support" +arch=(i686 x86_64 armv7h) +url="https://konqueror.org/" +license=(LGPL) +depends=(dolphin keditbookmarks) +makedepends=(extra-cmake-modules kdoctools python tidy kdesignerplugin kdesu) +optdepends=('tidy: tidy HTML plugin' 'kdesu: shell command plugin') +conflicts=(kdebase-konqueror kdebase-konq-plugins) +replaces=(kdebase-konqueror kdebase-konq-plugins) +groups=(kde-applications kdebase) +source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} + 'libre.patch') +md5sums=('ebc2f5db4aa377ca11d4e4a7cdf3bf7f' + 'SKIP' + 'dc679b64429e08e541f27268a8faadd6') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org> + +prepare() { + mkdir -p build + + cd $pkgname-$pkgver + # Remove nonfree WebEngine support and nonfree software or Google recommendation + rm -rv webenginepart + patch -p1 -i ../libre.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/libre-testing/konqueror/libre.patch b/libre-testing/konqueror/libre.patch new file mode 100644 index 000000000..81251960d --- /dev/null +++ b/libre-testing/konqueror/libre.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b1c8782c..8a822fcf8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ include(ECMSetupVersion) + set(KONQUEROR_LIB_VERSION "5.0.97") + set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}") + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml KDELibs4Support Archive Crash) + + find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional +@@ -52,7 +52,6 @@ add_subdirectory( libkonq ) + add_subdirectory( src ) + add_subdirectory( client ) + add_subdirectory( autotests ) +-add_subdirectory( webenginepart ) + + add_subdirectory( about ) + add_subdirectory( pics ) +diff --git a/about/konq_aboutpage.cpp b/about/konq_aboutpage.cpp +index 017875809..fc95efa89 100644 +--- a/about/konq_aboutpage.cpp ++++ b/about/konq_aboutpage.cpp +@@ -219,14 +219,11 @@ QString KonqAboutPageSingleton::specs() + QStringLiteral("http://www.ecma-international.org/publications/standards/ECMA-262.HTM"))) + .arg(i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) + .arg(i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // leave the double backslashes here, they are necessary for javascript ! +- .arg(i18n("Secure <A HREF=\"%1\">Java</A><SUP>®</SUP> support", QStringLiteral("http://www.oracle.com/technetwork/java/index.html"))) +- .arg(i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">IBM</A> or <A HREF=\"%2\">Sun/Oracle</A>)", +- QStringLiteral("http://www.ibm.com"), QStringLiteral("http://www.oracle.com/technetwork/java/index.html"))) ++ .arg(i18n("Secure Java<SUP>®</SUP> support"), ++ QStringLiteral("about:plugins")) + .arg(i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // TODO Maybe test if Java is enabled ? +- .arg(i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>®</SUP></A>, <A HREF=\"%2\">Real<SUP>®</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>®</SUP></A>Video, etc.)", +- QStringLiteral("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"), +- QStringLiteral("http://www.real.com"), QStringLiteral("http://www.real.com"), +- QStringLiteral("about:plugins"))) ++ .arg(i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%1\">plugins</A>"), ++ QStringLiteral("about:plugins")) + .arg(i18n("built-in")) + .arg(i18n("Secure Sockets Layer")) + .arg(i18n("(TLS/SSL v2/3) for secure communications up to 168bit")) +@@ -301,8 +298,8 @@ QString KonqAboutPageSingleton::tips() + .arg(i18n("Tips")) + .arg(i18n("Specifications")) + .arg(i18n("Tips & Tricks")) +- .arg(i18n("Use Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, " +- "using Google, for the search phrase \"KDE\". There are a lot of " ++ .arg(i18n("Use Web-Shortcuts: by typing \"dd: KDE\" one can search the Internet, " ++ "using DuckDuckGo HTML, for the search phrase \"KDE\". There are a lot of " + "Web-Shortcuts predefined to make searching for software or looking " + "up certain words in an encyclopedia a breeze. You can even " + "<a href=\"%1\">create your own</a> Web-Shortcuts.", QStringLiteral("exec:/kcmshell5 webshortcuts"))) |