From 03846bb3a8aa1d821207ec14b9ec865e292cd4bf Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 23 Jun 2018 12:25:17 +0200 Subject: Package rebuilds due to poppler upgrade in slackware-current deps:poppler frameworks:kfilemetadata5 kdepim:kdepim-addons applications:okular applications-extra:calligra,krita --- kde/build/calligra | 2 +- kde/build/kdepim-addons | 1 + kde/build/kfilemetadata5 | 1 + kde/build/krita | 1 + kde/build/okular | 1 + kde/cmake/plasma-browser-integration | 24 ++++++++++++++++++++++ kde/patch/plasma-browser-integration.patch | 3 +++ .../plasma-browser-integration_KDEBUG-113461.patch | 11 ++++++++++ kde/slack-desc/plasma-browser-integration | 19 +++++++++++++++++ 9 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 kde/build/kdepim-addons create mode 100644 kde/build/kfilemetadata5 create mode 100644 kde/build/krita create mode 100644 kde/build/okular create mode 100644 kde/cmake/plasma-browser-integration create mode 100644 kde/patch/plasma-browser-integration.patch create mode 100644 kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch create mode 100644 kde/slack-desc/plasma-browser-integration (limited to 'kde') diff --git a/kde/build/calligra b/kde/build/calligra index 7ed6ff8..1e8b314 100644 --- a/kde/build/calligra +++ b/kde/build/calligra @@ -1 +1 @@ -5 +6 diff --git a/kde/build/kdepim-addons b/kde/build/kdepim-addons new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/kde/build/kdepim-addons @@ -0,0 +1 @@ +2 diff --git a/kde/build/kfilemetadata5 b/kde/build/kfilemetadata5 new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/kde/build/kfilemetadata5 @@ -0,0 +1 @@ +2 diff --git a/kde/build/krita b/kde/build/krita new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/kde/build/krita @@ -0,0 +1 @@ +2 diff --git a/kde/build/okular b/kde/build/okular new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/kde/build/okular @@ -0,0 +1 @@ +2 diff --git a/kde/cmake/plasma-browser-integration b/kde/cmake/plasma-browser-integration new file mode 100644 index 0000000..c9b3db9 --- /dev/null +++ b/kde/cmake/plasma-browser-integration @@ -0,0 +1,24 @@ +mkdir build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ + -DKDE_INSTALL_LIBEXECDIR=lib$LIBDIRSUFFIX \ + -DKDE_INSTALL_MANDIR=/usr/man \ + -DKDE_INSTALL_QTPLUGINDIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DKDE_INSTALL_QMLDIR=lib$LIBDIRSUFFIX/qt5/qml \ + -DKDE_INSTALL_SYSCONFDIR=/etc \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DINSTALL_CHROME_MANIFEST=ON \ + .. + diff --git a/kde/patch/plasma-browser-integration.patch b/kde/patch/plasma-browser-integration.patch new file mode 100644 index 0000000..c82fee9 --- /dev/null +++ b/kde/patch/plasma-browser-integration.patch @@ -0,0 +1,3 @@ +# Fix hardcoded mozilla 'lib' libdir: +cat $CWD/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch b/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch new file mode 100644 index 0000000..c881edf --- /dev/null +++ b/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2018-06-07 22:22:27.000000000 +0800 ++++ b/CMakeLists.txt 2018-06-20 20:55:56.000000000 +0800 +@@ -45,7 +45,7 @@ + option(COPY_MESSAGING_HOST_FILE_HOME "Copy the native messaging hosts json file to user home dir" FALSE) + add_feature_info(COPY_MESSAGING_HOST_FILE_HOME ${COPY_MESSAGING_HOST_FILE_HOME} "Enable this option to copy the native messaging hosts json file to home dir if you install plasma-browser-integration to custom prefix (non-/usr)") + +-set(MOZILLA_DIR "${CMAKE_INSTALL_PREFIX}/lib/mozilla" CACHE STRING "Mozilla directory") ++set(MOZILLA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBDIR}/mozilla" CACHE STRING "Mozilla directory") + add_feature_info(MOZILLA_DIR On "Mozilla directory is '${MOZILLA_DIR}'") + + add_subdirectory(host) diff --git a/kde/slack-desc/plasma-browser-integration b/kde/slack-desc/plasma-browser-integration new file mode 100644 index 0000000..97d3468 --- /dev/null +++ b/kde/slack-desc/plasma-browser-integration @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +plasma-browser-integration: plasma-browser-integration (integrate browsers into the Plasma desktop) +plasma-browser-integration: +plasma-browser-integration: The plasma-browser-integration package contains +plasma-browser-integration: omponents necessary to integrate browsers into the Plasma Desktop +plasma-browser-integration: +plasma-browser-integration: +plasma-browser-integration: +plasma-browser-integration: +plasma-browser-integration: +plasma-browser-integration: Home page: https://www.kde.org/plasma-desktop +plasma-browser-integration: -- cgit v1.2.3