fix other packages

2025-02-03 04:37:18 +08:00 · 2018-06-15 00:44:08 +02:00 · 2018-06-15 00:44:08 +02:00 · f094104b90
commit f094104b90
parent df62450420
11 changed files with 92 additions and 61 deletions
--- a/breeze/PKGBUILD
+++ b/breeze/PKGBUILD
@ -24,7 +24,15 @@ prepare() {

 build() {
  cd build
-  cmake_kf5 ../${pkgbase}-${pkgver}
+  cmake ../${pkgname}-${pkgver} \
+         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON "$@"
  make

  cd ../build-kde4
--- a/libbluedevil-kf5/PKGBUILD
+++ b/libbluedevil-kf5/PKGBUILD
@ -1,38 +0,0 @@
-# Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/libbluedevil-frameworks
-source ../plasma.conf
-
-pkgname=libbluedevil-kf5
-_pkgname=libbluedevil
-pkgver=${PVersion}
-pkgrel=1
-pkgdesc="KDE bluetooth framework libraries"
-arch=('x86_64')
-url='https://projects.kde.org/projects/kde/workspace/libbluedevil'
-license=('LGPL')
-depends=('qt5-base' 'bluez')
-makedepends=('extra-cmake-modules')
-groups=('plasma')
-options=("debug")
-conflicts=('libbluedevil')
-replaces=('libbluedevil')
-provides=('libbluedevil')
-source=("${PServer}/${pkgver}/${_pkgname}-${PSubVersion}.tar.xz")
-sha256sums=( $(getSum ${_pkgname}) )
-
-prepare() {
-  mkdir -p build
-  cd ${_pkgname}-${pkgver}
-}
-
-build() {
-  cd build
-  cmake_kf5 ../${_pkgname}-${pkgver} \
-      -DCMAKE_INSTALL_LIBDIR=lib \
-      -DPYTHON_EXECUTABLE=/usr/bin/python3
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
--- a/oxygen-fonts/PKGBUILD
+++ b/oxygen-fonts/PKGBUILD
@ -1,8 +1,7 @@
 #Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/ttf-oxygen
-source ../plasma.conf

 pkgname=oxygen-fonts
-pkgver=${PVersion}
+pkgver=5.13.0
 pkgrel=1
 pkgdesc='The Oxygen font family. A desktop/gui font family for integrated use with the KDE desktop'
 url='https://projects.kde.org/projects/kde/workspace/oxygen-fonts'
@ -15,8 +14,13 @@ depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
 makedepends=('extra-cmake-modules' 'qt5-base' 'fontforge')
 options=('!emptydirs')
 install=${pkgname}.install
-source=("${PServer}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=( $(getSum ${pkgname} | head -n 1) )
+source=("https://download.kde.org/stable/plasma/$pkgver/$_pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('95dd1da6458f0777f494d18647e07776c77477a6887316738868a54f5f024b69'
+             'SKIP' )
+validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
+              '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
+              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson
+              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>

 prepare() {
  mkdir -p build
@ -24,7 +28,15 @@ prepare() {

 build() {
  cd build
-  cmake_kf5 ../oxygen-fonts-${pkgver}
+  cmake ../${pkgname}-${pkgver} \
+         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON "$@"
  make
 }

--- a/oxygen-kde4/PKGBUILD
+++ b/oxygen-kde4/PKGBUILD
@ -1,10 +1,8 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>

-source ../plasma.conf
-
 _pkgname=oxygen
 pkgname=oxygen-kde4
-pkgver=${PVersion}
+pkgver=5.13.0
 pkgrel=1
 pkgdesc='Artwork, styles and assets for the Oxygen visual style for the KDE4'
 arch=('x86_64')
@ -16,8 +14,13 @@ checkdepends=("cmake")
 groups=('plasma')
 options=("debug")
 conflicts=('kde-workspace')
-source=("${PServer}/${pkgver}/${_pkgname}-${PSubVersion}.tar.xz")
-sha256sums=( $(getSum ${_pkgname} | head -n 1) )
+source=("https://download.kde.org/stable/plasma/$pkgver/$_pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('95dd1da6458f0777f494d18647e07776c77477a6887316738868a54f5f024b69'
+             'SKIP' )
+validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
+              '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
+              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson
+              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>

 prepare() {
  mkdir -p build
--- a/oxygen/PKGBUILD
+++ b/oxygen/PKGBUILD
@ -24,12 +24,20 @@ prepare() {

 build() {
  cd build
-  cmake_kf5 ../$pkgname-$PSubVersion 
+  cmake ../${pkgname}-${pkgver} \
+         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON "$@"
  make
  cd ..

  cd build-kde4
-  cmake ../$pkgname-$PSubVersion \
+  cmake ../${pkgname}-${pkgver} \
    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DBUILD_TESTING=OFF \
--- a/plasma-integration/PKGBUILD
+++ b/plasma-integration/PKGBUILD
@ -24,7 +24,15 @@ prepare() {

 build() {
  cd build
-  cmake_kf5 ../$pkgname-$pkgver
+  cmake ../${pkgname}-${pkgver} \
+         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON "$@"
  make
 }

--- a/plasma-mediacenter/PKGBUILD
+++ b/plasma-mediacenter/PKGBUILD
@ -20,7 +20,15 @@ prepare() {

 build() {
  cd build
-  cmake_kf5 ../${pkgname}-${pkgver}
+  cmake ../${pkgname}-${pkgver} \
+         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON "$@"
  make
 }
 package() {
--- a/plasma-nm/PKGBUILD
+++ b/plasma-nm/PKGBUILD
@ -27,7 +27,15 @@ prepare() {

 build() {
  cd build
-  cmake_kf5 ../${pkgname}-${PSubVersion}
+  cmake ../${pkgname}-${pkgver} \
+         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON "$@"
  make
 }

--- a/plasma-workspace/PKGBUILD
+++ b/plasma-workspace/PKGBUILD
@ -34,7 +34,15 @@ prepare() {

 build() {
  cd build
-  cmake_kf5 ../${pkgbase}-${pkgver}
+  cmake ../${pkgname}-${pkgver} \
+         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON "$@"
  make
 }

--- a/plasma.order
+++ b/plasma.order
@ -5,7 +5,7 @@
 #
 # These are the building "groups" or "package lists"
 # (or stages").
-# GitLab-CI:6
+# GitLab-CI:7

 bluedevil
 polkit-kde-agent
--- a/polkit-kde-agent/PKGBUILD
+++ b/polkit-kde-agent/PKGBUILD
@ -19,18 +19,24 @@ validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>

 prepare() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
  mkdir -p build
 }

 build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}/build
-  cmake_kf5 .. \
-    -DLIBEXEC_INSTALL_DIR=lib/polkit-kde 
+  cd build
+  cmake ../${_pkgname}-${pkgver} \
+         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON "$@"  -DLIBEXEC_INSTALL_DIR=lib/polkit-kde 
  make
 }

 package() {
-  cd ${srcdir}/${_pkgname}-${pkgver}/build
+  cd build
  make DESTDIR="$pkgdir" install
 }