[arch-commits] Commit in kdebase-runtime/repos (6 files)

Antonio Rojas arojas at archlinux.org
Thu Jan 19 12:22:54 UTC 2017


    Date: Thursday, January 19, 2017 @ 12:22:54
  Author: arojas
Revision: 286971

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kdebase-runtime/repos/extra-i686/PKGBUILD
    (from rev 286970, kdebase-runtime/trunk/PKGBUILD)
  kdebase-runtime/repos/extra-i686/kdebase-runtime-no-html-thumbnails.patch
    (from rev 286970, kdebase-runtime/trunk/kdebase-runtime-no-html-thumbnails.patch)
  kdebase-runtime/repos/extra-x86_64/PKGBUILD
    (from rev 286970, kdebase-runtime/trunk/PKGBUILD)
  kdebase-runtime/repos/extra-x86_64/kdebase-runtime-no-html-thumbnails.patch
    (from rev 286970, kdebase-runtime/trunk/kdebase-runtime-no-html-thumbnails.patch)
Deleted:
  kdebase-runtime/repos/extra-i686/PKGBUILD
  kdebase-runtime/repos/extra-x86_64/PKGBUILD

-------------------------------------------------------+
 /PKGBUILD                                             |  134 ++++++++++++++++
 extra-i686/PKGBUILD                                   |   62 -------
 extra-i686/kdebase-runtime-no-html-thumbnails.patch   |   21 ++
 extra-x86_64/PKGBUILD                                 |   62 -------
 extra-x86_64/kdebase-runtime-no-html-thumbnails.patch |   21 ++
 5 files changed, 176 insertions(+), 124 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-01-19 12:22:11 UTC (rev 286970)
+++ extra-i686/PKGBUILD	2017-01-19 12:22:54 UTC (rev 286971)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=16.12.1
-pkgrel=1
-pkgdesc="Plugins and applications necessary for the running of KDE applications"
-arch=('i686' 'x86_64')
-url='https://www.kde.org/'
-license=('GPL' 'LGPL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'openslp' 'doxygen' 'networkmanager' 'boost')
-depends=('kdelibs' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp' 'exiv2' 'gpgme')
-optdepends=('drkonqi: crash report tool' 'khelpcenter: to display applications documentation')
-provides=(notification-daemon)
-conflicts=(kdesu4)
-replaces=(kdesu4)
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"{,.sig})
-sha1sums=('0546a3fb14e402b5026fb7fd8c07f0bc6c51829a'
-          'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
-  mkdir -p build
-
-# Don't link to kactivities
-  sed -e '/plasmaextracomponents/d' -i kde-runtime-$pkgver/plasma/declarativeimports/CMakeLists.txt
-}
-
-build() {
-  cd build
-  cmake ../kde-runtime-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_QNtrack=OFF \
-    -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
-    -DWITH_NepomukCore=OFF \
-    -DBUILD_khelpcenter=OFF \
-    -DBUILD_kglobalaccel=OFF \
-    -DBUILD_kuiserver=OFF \
-    -DBUILD_drkonqi=OFF \
-    -DBUILD_doc=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  rm "$pkgdir"/usr/share/icons/hicolor/index.theme
-  ln -s /usr/lib/kde4/libexec/kdesu "$pkgdir"/usr/bin/kdesu4
-
-# Use KF5 drkonqi
-  ln -s /usr/lib/drkonqi "$pkgdir"/usr/lib/kde4/libexec/
-
-# FS#36668
-  chown :nobody "$pkgdir"/usr/lib/kde4/libexec/kdesud
-  chmod g+s "$pkgdir"/usr/lib/kde4/libexec/kdesud
-}

Copied: kdebase-runtime/repos/extra-i686/PKGBUILD (from rev 286970, kdebase-runtime/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-01-19 12:22:54 UTC (rev 286971)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-runtime
+pkgver=16.12.1
+pkgrel=2
+pkgdesc="Plugins and applications necessary for the running of KDE applications"
+arch=('i686' 'x86_64')
+url='https://www.kde.org/'
+license=('GPL' 'LGPL')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'openslp' 'doxygen' 'networkmanager' 'boost')
+depends=('kdelibs' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp' 'exiv2' 'gpgme')
+optdepends=('drkonqi: crash report tool' 'khelpcenter: to display applications documentation')
+provides=(notification-daemon)
+conflicts=(kdesu4)
+replaces=(kdesu4)
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"{,.sig}
+        kdebase-runtime-no-html-thumbnails.patch)
+sha1sums=('0546a3fb14e402b5026fb7fd8c07f0bc6c51829a'
+          'SKIP'
+          '5f78db33cfdae44e53aa5bb0b7bd9ebdc1e42808')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+  mkdir -p build
+
+# Don't link to kactivities
+  sed -e '/plasmaextracomponents/d' -i kde-runtime-$pkgver/plasma/declarativeimports/CMakeLists.txt
+# Drop HTML thumbnailer, uses insecure QtWebKit
+  cd kde-runtime-$pkgver
+  patch -p1 -i ../kdebase-runtime-no-html-thumbnails.patch
+}
+
+build() {
+  cd build
+  cmake ../kde-runtime-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_QNtrack=OFF \
+    -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
+    -DWITH_NepomukCore=OFF \
+    -DBUILD_khelpcenter=OFF \
+    -DBUILD_kglobalaccel=OFF \
+    -DBUILD_kuiserver=OFF \
+    -DBUILD_drkonqi=OFF \
+    -DBUILD_doc=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  rm "$pkgdir"/usr/share/icons/hicolor/index.theme
+  ln -s /usr/lib/kde4/libexec/kdesu "$pkgdir"/usr/bin/kdesu4
+
+# Use KF5 drkonqi
+  ln -s /usr/lib/drkonqi "$pkgdir"/usr/lib/kde4/libexec/
+
+# FS#36668
+  chown :nobody "$pkgdir"/usr/lib/kde4/libexec/kdesud
+  chmod g+s "$pkgdir"/usr/lib/kde4/libexec/kdesud
+}

Copied: kdebase-runtime/repos/extra-i686/kdebase-runtime-no-html-thumbnails.patch (from rev 286970, kdebase-runtime/trunk/kdebase-runtime-no-html-thumbnails.patch)
===================================================================
--- extra-i686/kdebase-runtime-no-html-thumbnails.patch	                        (rev 0)
+++ extra-i686/kdebase-runtime-no-html-thumbnails.patch	2017-01-19 12:22:54 UTC (rev 286971)
@@ -0,0 +1,21 @@
+--- kde-runtime-16.12.1/kioslave/thumbnail/CMakeLists.txt.0	2017-01-19 12:11:22.764891155 +0000
++++ kde-runtime-16.12.1/kioslave/thumbnail/CMakeLists.txt	2017-01-19 12:11:40.741524858 +0000
+@@ -89,18 +89,6 @@
+ 
+ ########### next target ###############
+ 
+-if(NOT WINCE)
+-set(htmlthumbnail_PART_SRCS htmlcreator.cpp)
+-
+-kde4_add_plugin(htmlthumbnail ${htmlthumbnail_PART_SRCS})
+-
+-target_link_libraries(htmlthumbnail ${KDE4_KDEWEBKIT_LIBS})
+-
+-install(TARGETS htmlthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(NOT WINCE)
+-
+-########### next target ###############
+-
+ if(NOT WIN32)
+ set(djvuthumbnail_PART_SRCS djvucreator.cpp)
+ 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-01-19 12:22:11 UTC (rev 286970)
+++ extra-x86_64/PKGBUILD	2017-01-19 12:22:54 UTC (rev 286971)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=16.12.1
-pkgrel=1
-pkgdesc="Plugins and applications necessary for the running of KDE applications"
-arch=('i686' 'x86_64')
-url='https://www.kde.org/'
-license=('GPL' 'LGPL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'openslp' 'doxygen' 'networkmanager' 'boost')
-depends=('kdelibs' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp' 'exiv2' 'gpgme')
-optdepends=('drkonqi: crash report tool' 'khelpcenter: to display applications documentation')
-provides=(notification-daemon)
-conflicts=(kdesu4)
-replaces=(kdesu4)
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"{,.sig})
-sha1sums=('0546a3fb14e402b5026fb7fd8c07f0bc6c51829a'
-          'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
-  mkdir -p build
-
-# Don't link to kactivities
-  sed -e '/plasmaextracomponents/d' -i kde-runtime-$pkgver/plasma/declarativeimports/CMakeLists.txt
-}
-
-build() {
-  cd build
-  cmake ../kde-runtime-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_QNtrack=OFF \
-    -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
-    -DWITH_NepomukCore=OFF \
-    -DBUILD_khelpcenter=OFF \
-    -DBUILD_kglobalaccel=OFF \
-    -DBUILD_kuiserver=OFF \
-    -DBUILD_drkonqi=OFF \
-    -DBUILD_doc=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  rm "$pkgdir"/usr/share/icons/hicolor/index.theme
-  ln -s /usr/lib/kde4/libexec/kdesu "$pkgdir"/usr/bin/kdesu4
-
-# Use KF5 drkonqi
-  ln -s /usr/lib/drkonqi "$pkgdir"/usr/lib/kde4/libexec/
-
-# FS#36668
-  chown :nobody "$pkgdir"/usr/lib/kde4/libexec/kdesud
-  chmod g+s "$pkgdir"/usr/lib/kde4/libexec/kdesud
-}

Copied: kdebase-runtime/repos/extra-x86_64/PKGBUILD (from rev 286970, kdebase-runtime/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-01-19 12:22:54 UTC (rev 286971)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-runtime
+pkgver=16.12.1
+pkgrel=2
+pkgdesc="Plugins and applications necessary for the running of KDE applications"
+arch=('i686' 'x86_64')
+url='https://www.kde.org/'
+license=('GPL' 'LGPL')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'openslp' 'doxygen' 'networkmanager' 'boost')
+depends=('kdelibs' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp' 'exiv2' 'gpgme')
+optdepends=('drkonqi: crash report tool' 'khelpcenter: to display applications documentation')
+provides=(notification-daemon)
+conflicts=(kdesu4)
+replaces=(kdesu4)
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"{,.sig}
+        kdebase-runtime-no-html-thumbnails.patch)
+sha1sums=('0546a3fb14e402b5026fb7fd8c07f0bc6c51829a'
+          'SKIP'
+          '5f78db33cfdae44e53aa5bb0b7bd9ebdc1e42808')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+  mkdir -p build
+
+# Don't link to kactivities
+  sed -e '/plasmaextracomponents/d' -i kde-runtime-$pkgver/plasma/declarativeimports/CMakeLists.txt
+# Drop HTML thumbnailer, uses insecure QtWebKit
+  cd kde-runtime-$pkgver
+  patch -p1 -i ../kdebase-runtime-no-html-thumbnails.patch
+}
+
+build() {
+  cd build
+  cmake ../kde-runtime-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_QNtrack=OFF \
+    -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
+    -DWITH_NepomukCore=OFF \
+    -DBUILD_khelpcenter=OFF \
+    -DBUILD_kglobalaccel=OFF \
+    -DBUILD_kuiserver=OFF \
+    -DBUILD_drkonqi=OFF \
+    -DBUILD_doc=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  rm "$pkgdir"/usr/share/icons/hicolor/index.theme
+  ln -s /usr/lib/kde4/libexec/kdesu "$pkgdir"/usr/bin/kdesu4
+
+# Use KF5 drkonqi
+  ln -s /usr/lib/drkonqi "$pkgdir"/usr/lib/kde4/libexec/
+
+# FS#36668
+  chown :nobody "$pkgdir"/usr/lib/kde4/libexec/kdesud
+  chmod g+s "$pkgdir"/usr/lib/kde4/libexec/kdesud
+}

Copied: kdebase-runtime/repos/extra-x86_64/kdebase-runtime-no-html-thumbnails.patch (from rev 286970, kdebase-runtime/trunk/kdebase-runtime-no-html-thumbnails.patch)
===================================================================
--- extra-x86_64/kdebase-runtime-no-html-thumbnails.patch	                        (rev 0)
+++ extra-x86_64/kdebase-runtime-no-html-thumbnails.patch	2017-01-19 12:22:54 UTC (rev 286971)
@@ -0,0 +1,21 @@
+--- kde-runtime-16.12.1/kioslave/thumbnail/CMakeLists.txt.0	2017-01-19 12:11:22.764891155 +0000
++++ kde-runtime-16.12.1/kioslave/thumbnail/CMakeLists.txt	2017-01-19 12:11:40.741524858 +0000
+@@ -89,18 +89,6 @@
+ 
+ ########### next target ###############
+ 
+-if(NOT WINCE)
+-set(htmlthumbnail_PART_SRCS htmlcreator.cpp)
+-
+-kde4_add_plugin(htmlthumbnail ${htmlthumbnail_PART_SRCS})
+-
+-target_link_libraries(htmlthumbnail ${KDE4_KDEWEBKIT_LIBS})
+-
+-install(TARGETS htmlthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(NOT WINCE)
+-
+-########### next target ###############
+-
+ if(NOT WIN32)
+ set(djvuthumbnail_PART_SRCS djvucreator.cpp)
+ 



More information about the arch-commits mailing list