diff --git a/packaging/archlinux/katana-baseapps/PKGBUILD b/packaging/archlinux/katana-baseapps/PKGBUILD index b8860c2..098e791 100644 --- a/packaging/archlinux/katana-baseapps/PKGBUILD +++ b/packaging/archlinux/katana-baseapps/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Pierre Schmitz pkgname=katana-baseapps -pkgver=4.17.0.2ae62c7 +pkgver=4.17.0.1dcef4f pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -21,18 +21,17 @@ depends=("katanalibs>=4.16.0" 'qjson') makedepends=('cmake' 'git' 'tidyhtml') # TODO: pykde4 source=("git+https://github.com/fluxer/kde-baseapps.git") sha1sums=('SKIP') -options=('debug') - conflicts=('kdebase-dolphin' - 'kdebase-kdepasswd' - 'kdebase-kdialog' - 'kdebase-keditbookmarks' - 'kdebase-kfind' - 'kdebase-konq-plugins' - 'kdebase-konqueror' - 'kdebase-lib' - 'kdebase-plasma' - 'kdebase-katepart' 'katepart4') + 'kdebase-kdepasswd' + 'kdebase-kdialog' + 'kdebase-keditbookmarks' + 'kdebase-kfind' + 'kdebase-konq-plugins' + 'kdebase-konqueror' + 'kdebase-lib' + 'kdebase-plasma' + 'kdebase-katepart' + 'katepart4') pkgver() { cd kde-baseapps @@ -46,7 +45,7 @@ prepare() { build() { cd build cmake ../kde-baseapps \ - -DCMAKE_BUILD_TYPE=RelWithDbgInfo \ + -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TESTING=OFF \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr diff --git a/packaging/archlinux/katana-extraapps/PKGBUILD b/packaging/archlinux/katana-extraapps/PKGBUILD index 12c4f48..307140f 100644 --- a/packaging/archlinux/katana-extraapps/PKGBUILD +++ b/packaging/archlinux/katana-extraapps/PKGBUILD @@ -3,7 +3,7 @@ # TODO: split into small packages pkgname=katana-extraapps -pkgver=4.17.0.58ccb03 +pkgver=4.17.0.2f06e6b pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -22,8 +22,6 @@ optdepends=('samba: sharing files and directories' 'cronie: task scheduling') source=("git+https://github.com/fluxer/kde-extraapps.git") sha1sums=('SKIP') -options=('debug') - conflicts=('kdeutils-ark') pkgver() { @@ -38,7 +36,7 @@ prepare() { build() { cd build cmake ../kde-extraapps \ - -DCMAKE_BUILD_TYPE=RelWithDbgInfo \ + -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TESTING=OFF \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr diff --git a/packaging/archlinux/katana-workspace/PKGBUILD b/packaging/archlinux/katana-workspace/PKGBUILD index b62b6c7..13d6225 100644 --- a/packaging/archlinux/katana-workspace/PKGBUILD +++ b/packaging/archlinux/katana-workspace/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Pierre Schmitz pkgname=katana-workspace -pkgver=4.17.0.6c7c43b +pkgver=4.17.0.506e331 pkgrel=1 pkgdesc="Katana workspace interface and basic tools" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ depends=("katanalibs>=4.16.0" "katana-baseapps>=4.16.0" 'libusb-compat' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font' 'libssh' 'prison' 'xcb-util-keysyms' 'xcb-util-wm' 'pciutils' 'glu' 'libgl' 'qjson' 'libmtp' 'libwebp' 'smbclient' 'libcanberra' - 'xorg-server' 'python') + 'xorg-server' 'python' 'eigen3' 'openslp') # FIXME: 'kdebindings-python' makedepends=('cmake' 'git' 'libnm-glib' 'xf86-input-synaptics' 'xorg-server-devel') @@ -43,8 +43,6 @@ sha1sums=('SKIP' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'aa9d2e5a69986c4c3d47829721ea99edb473be12') -options=('debug') - conflicts=('kdebase-workspace' 'kdebase-runtime') pkgver() { @@ -67,7 +65,7 @@ prepare() { build() { cd build cmake ../kde-workspace \ - -DCMAKE_BUILD_TYPE=RelWithDbgInfo \ + -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TESTING=OFF \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/packaging/archlinux/katanalibs/PKGBUILD b/packaging/archlinux/katanalibs/PKGBUILD index d20d7a6..85d859d 100644 --- a/packaging/archlinux/katanalibs/PKGBUILD +++ b/packaging/archlinux/katanalibs/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Pierre Schmitz pkgname=katanalibs -pkgver=4.17.0.ffa31c2 +pkgver=4.17.0.8bbda43 pkgrel=1 pkgdesc="Katana core libraries" arch=('i686' 'x86_64') @@ -23,9 +23,8 @@ source=("git+https://github.com/fluxer/kdelibs.git" 'kde-applications-menu.patch' 'archlinux-menu.patch') sha1sums=('SKIP' '08f3d7f10fd2ab48be0837980c351ee501fb302b' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67') + 'c5ea95621a7ed3150906c511d1192fa8f79d1501') conflicts=('kdelibs' 'libkdcraw' 'libkexiv2' 'libkcddb' 'libkcompactdisc') -options=('debug') pkgver() { cd kdelibs @@ -44,7 +43,7 @@ prepare() { build() { cd build cmake ../kdelibs \ - -DCMAKE_BUILD_TYPE=RelWithDbgInfo \ + -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TESTING=OFF \ -DCMAKE_SKIP_RPATH=ON \ -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ @@ -61,8 +60,7 @@ package() { cd "${srcdir}"/build make DESTDIR="${pkgdir}" install - # cert bundle seems to be hardcoded - # link it to the one from ca-certificates - rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt + # cert bundle seems to be hardcoded, link it to the one from ca-certificates + ln -vsf /etc/ssl/certs/ca-certificates.crt \ + "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt } diff --git a/packaging/archlinux/katanalibs/archlinux-menu.patch b/packaging/archlinux/katanalibs/archlinux-menu.patch index 546784f..90d5b85 100644 --- a/packaging/archlinux/katanalibs/archlinux-menu.patch +++ b/packaging/archlinux/katanalibs/archlinux-menu.patch @@ -10,10 +10,10 @@ -+ Arch Linux -+ Archlinux.directory -+ -+ Archlinux ++ Arch Linux ++ Archlinux.directory ++ ++ Archlinux + +