From 187730156d89987a6107bf57e6f60de8e3395def Mon Sep 17 00:00:00 2001 From: totte Date: Mon, 13 Jan 2014 01:11:58 +0000 Subject: [PATCH] multiple: Undo renamings --- kde-baseapps-konsole/PKGBUILD | 41 +++++++++ kde-baseapps-konsole/Shell_new.diff | 20 +++++ kde-baseapps-konsole/konsole_defaults.patch | 24 +++++ {kdnssd => kdenetwork-kdnssd}/PKGBUILD | 14 ++- .../kdenetwork.install | 0 kdesdk-dolphin-plugins/PKGBUILD | 38 ++++++++ .../kdesdk-dolphin-plugins.install | 2 +- kget/PKGBUILD | 39 -------- kget/kdenetwork.install | 88 ------------------- kppp/PKGBUILD | 39 -------- krfb/PKGBUILD | 42 --------- krfb/kdenetwork.install | 88 ------------------- 12 files changed, 130 insertions(+), 305 deletions(-) create mode 100644 kde-baseapps-konsole/PKGBUILD create mode 100644 kde-baseapps-konsole/Shell_new.diff create mode 100644 kde-baseapps-konsole/konsole_defaults.patch rename {kdnssd => kdenetwork-kdnssd}/PKGBUILD (71%) rename {kdnssd => kdenetwork-kdnssd}/kdenetwork.install (100%) create mode 100644 kdesdk-dolphin-plugins/PKGBUILD rename kppp/kdenetwork.install => kdesdk-dolphin-plugins/kdesdk-dolphin-plugins.install (99%) delete mode 100644 kget/PKGBUILD delete mode 100644 kget/kdenetwork.install delete mode 100644 kppp/PKGBUILD delete mode 100644 krfb/PKGBUILD delete mode 100644 krfb/kdenetwork.install diff --git a/kde-baseapps-konsole/PKGBUILD b/kde-baseapps-konsole/PKGBUILD new file mode 100644 index 000000000..334b3b7bf --- /dev/null +++ b/kde-baseapps-konsole/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa + +# Include global configuration +source ../_buildscripts/${current_repo}-${_arch}-cfg.conf + +pkgname=kde-baseapps-konsole +pkgver=${_kdever} +pkgrel=1 +pkgdesc="KDE terminal emulator" +url='http://kde.org/applications/system/konsole/' +screenshot="http://userbase.kde.org/images.userbase/6/64/Konsole-KDE4.png" +arch=('x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}") +makedepends=('cmake' 'automoc4') +groups=('kde' 'kde-baseapps' 'kde-uninstall') +provides=('kdebase-konsole') +conflicts=('kdebase-konsole') +replaces=('kdebase-konsole') +categories=('system') +options=('docs' '!header' 'debug' 'log') +source=("$_mirror/konsole-$_kdever.tar.xz" + "Shell_new.diff") +sha256sums=(`grep konsole-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1` + '3a3f0fbc43cbeef19fecc5d6602ac97ff9982990a22b933e0f7c8333559e9d8e') + +build() { + cd "${srcdir}/konsole-$pkgver" + patch -p1 -i ${srcdir}/Shell_new.diff + cmake . \ + -DCMAKE_BUILD_TYPE=${_build_type} \ + -DCMAKE_INSTALL_PREFIX=${_installprefix} \ + -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' + make +} + +package() { + cd "${srcdir}/konsole-$pkgver" + make DESTDIR="${pkgdir}" install +} diff --git a/kde-baseapps-konsole/Shell_new.diff b/kde-baseapps-konsole/Shell_new.diff new file mode 100644 index 000000000..0f82a25f0 --- /dev/null +++ b/kde-baseapps-konsole/Shell_new.diff @@ -0,0 +1,20 @@ +--- a/data/profiles/Shell.profile 2012-08-13 05:24:27.000000000 -0400 ++++ b/data/profiles/Shell.profile 2012-09-03 19:15:44.689246940 -0400 +@@ -170,3 +170,17 @@ + Comment[x-test]=xxKonsole default profilexx + Comment[zh_CN]=Konsole 默认配置 + Comment[zh_TW]=Konsole 預設設定檔 ++ ++ShowNewAndCloseTabButtons=true ++ ++[Appearance] ++AntiAliasFonts=true ++ColorScheme=Linux ++Font=Bitstream Vera Sans Mono,10,-1,0,75,0,0,0,0,0 ++ ++[Scrolling] ++HistoryMode=2 ++ ++[Terminal Features] ++BlinkingCursorEnabled=true ++BidiRenderingEnabled=true diff --git a/kde-baseapps-konsole/konsole_defaults.patch b/kde-baseapps-konsole/konsole_defaults.patch new file mode 100644 index 000000000..ffcd315ba --- /dev/null +++ b/kde-baseapps-konsole/konsole_defaults.patch @@ -0,0 +1,24 @@ +diff -Naur kdebase-4.3.80.orig/apps/konsole/data/profiles/Shell.profile kdebase-4.3.80/apps/konsole/data/profiles/Shell.profile +--- kdebase-4.3.80.orig/apps/konsole/data/profiles/Shell.profile 2009-11-21 10:43:48.000000000 +0100 ++++ kdebase-4.3.80/apps/konsole/data/profiles/Shell.profile 2009-12-06 20:45:03.000000000 +0100 +@@ -174,13 +174,18 @@ + LocalTabTitleFormat=%D : %n + RemoteTabTitleFormat=(%u) %H + ++[General] ++ShowNewAndCloseTabButtons=true ++ + [Appearance] ++AntiAliasFonts=true + ColorScheme=Linux ++Font=Bitstream Vera Sans Mono,10,-1,0,75,0,0,0,0,0 + + [Scrolling] +-ScrollMode=FixedLineCount +-ScrollLineCount=1000 ++HistoryMode=2 + + [Terminal Features] ++BlinkingCursorEnabled=true + BidiRenderingEnabled=true + \ No newline at end of file diff --git a/kdnssd/PKGBUILD b/kdenetwork-kdnssd/PKGBUILD similarity index 71% rename from kdnssd/PKGBUILD rename to kdenetwork-kdnssd/PKGBUILD index d4c9ce34a..99faf21a1 100644 --- a/kdnssd/PKGBUILD +++ b/kdenetwork-kdnssd/PKGBUILD @@ -4,26 +4,24 @@ # Include global configuration source ../_buildscripts/${current_repo}-${_arch}-cfg.conf -pkgname="kdnssd" +pkgname="kdenetwork-kdnssd" arch=('x86_64') pkgver=${_kdever} pkgrel=1 pkgdesc='Monitors the network for DNS-SD services' depends=("kdelibs>=${_kdever}") -provides=("kdenetwork-kdnssd") -replaces=("kdenetwork-kdnssd") -conflicts=("kdenetwork-common" "kdenetwork-doc" "kdenetwork-kdnssd") +conflicts=("kdenetwork-common" "kdenetwork-doc") groups=("kde" "kdenetwork" "kde-uninstall") categories=('network') url="http://www.kde.org" license=('GPL' 'LGPL' 'FDL') options=('docs' '!header' 'debug' 'log') makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl') -source=("$_mirror/$pkgname-$_kdever.tar.xz") -sha256sums=(`grep $pkgname-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) +source=("$_mirror/kdnssd-$_kdever.tar.xz") +sha256sums=(`grep kdnssd-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) build() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir}/kdnssd-$pkgver cmake . \ -DCMAKE_BUILD_TYPE=${_build_type} \ -DCMAKE_INSTALL_PREFIX=${_installprefix} \ @@ -33,6 +31,6 @@ build() { } package() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir}/kdnssd-$pkgver make DESTDIR=${pkgdir} install } diff --git a/kdnssd/kdenetwork.install b/kdenetwork-kdnssd/kdenetwork.install similarity index 100% rename from kdnssd/kdenetwork.install rename to kdenetwork-kdnssd/kdenetwork.install diff --git a/kdesdk-dolphin-plugins/PKGBUILD b/kdesdk-dolphin-plugins/PKGBUILD new file mode 100644 index 000000000..d9e2d734d --- /dev/null +++ b/kdesdk-dolphin-plugins/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa + +# Include global configuration +source ../_buildscripts/${current_repo}-${_arch}-cfg.conf + +pkgname="kdesdk-dolphin-plugins" +arch=('x86_64') +pkgver=${_kdever} +pkgrel=1 +pkgdesc='Dolphin plugins' +url="http://www.kde.org" +license=('GPL' 'LGPL' 'FDL') +depends=("kde-baseapps-dolphin>=${_kdever}" 'subversion' 'git' "kdesdk-kompare>=${_kdever}") +optdepends=('bzr: bazaar support' + 'git: git support' + 'mercurial: hg support' + 'subversion: svn support') +categories=('programming') +install=${pkgname}.install +options=('docs' '!header' 'debug' 'log') +makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl') +source=("$_mirror/dolphin-plugins-$_kdever.tar.xz") +sha256sums=(`grep dolphin-plugins-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) + +build() { + cd ${srcdir}/dolphin-plugins-${pkgver} + cmake . \ + -DCMAKE_BUILD_TYPE=${_build_type} \ + -DCMAKE_INSTALL_PREFIX=${_installprefix} \ + -DCMAKE_SKIP_RPATH=ON + make +} + +package() { + cd ${srcdir}/dolphin-plugins-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/kppp/kdenetwork.install b/kdesdk-dolphin-plugins/kdesdk-dolphin-plugins.install similarity index 99% rename from kppp/kdenetwork.install rename to kdesdk-dolphin-plugins/kdesdk-dolphin-plugins.install index 4ae139dbd..8ac54a271 100644 --- a/kppp/kdenetwork.install +++ b/kdesdk-dolphin-plugins/kdesdk-dolphin-plugins.install @@ -9,7 +9,7 @@ post_install() { if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then /usr/bin/chakra-update-sycoca - fi + fi if [ "$UPDATE_USER_CONFIG" = "yes" ]; then /usr/bin/chakra-update-user-sycoca diff --git a/kget/PKGBUILD b/kget/PKGBUILD deleted file mode 100644 index fbdb5d996..000000000 --- a/kget/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: H W Tovetjärn (totte) -# Contributors: Manuel Tortosa - -# Include global configuration -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname="kget" -arch=('x86_64') -pkgver=${_kdever} -pkgrel=1 -pkgdesc="Download manager" -url="http://kde.org/applications/internet/kget/" -depends=("kde-workspace=4.11.5" 'qca' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.4' 'libmms') -groups=("kde" "kdenetwork" "kde-uninstall") -categories=('network') -conflicts=("kdenetwork-common" "kdenetwork-doc" "kdenetwork-kget") -provides=("kdenetwork-kget") -replaces=("kdenetwork-kget") -install=kdenetwork.install -license=('GPL' 'LGPL' 'FDL') -options=('docs' '!header' 'debug' 'log') -makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl') -source=("$_mirror/$pkgname-$_kdever.tar.xz") -sha256sums=(`grep $pkgname-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) - -build() { - cd ${srcdir}/$pkgname-$pkgver - cmake . \ - -DCMAKE_BUILD_TYPE=${_build_type} \ - -DCMAKE_INSTALL_PREFIX=${_installprefix} \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install -} diff --git a/kget/kdenetwork.install b/kget/kdenetwork.install deleted file mode 100644 index 4ae139dbd..000000000 --- a/kget/kdenetwork.install +++ /dev/null @@ -1,88 +0,0 @@ -post_install() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-sycoca - fi - - if [ "$UPDATE_USER_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-user-sycoca - fi - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -post_upgrade() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-sycoca - fi - - if [ "$UPDATE_USER_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-user-sycoca - fi - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -post_remove() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-sycoca - fi - - if [ "$UPDATE_USER_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-user-sycoca - fi - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -op=$1 -shift - -$op $* diff --git a/kppp/PKGBUILD b/kppp/PKGBUILD deleted file mode 100644 index ddfc43dce..000000000 --- a/kppp/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: H W Tovetjärn (totte) -# Contributors: Manuel Tortosa - -# Include global configuration -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname="kppp" -arch=('x86_64') -pkgver=${_kdever} -pkgrel=1 -pkgdesc="PPP client" -url="http://kde.org/applications/internet/kppp/" -depends=("kde-runtime>=${_kdever}" 'ppp') -groups=("kde" "kdenetwork" "kde-uninstall") -categories=('network') -conflicts=("kdenetwork-common" "kdenetwork-doc" "kdenetwork-kppp") -provides=("kdenetwork-kppp") -replaces=("kdenetwork-kppp") -install=kdenetwork.install -license=('GPL' 'LGPL' 'FDL') -options=('docs' '!header' 'debug' 'log') -makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl') -source=("$_mirror/$pkgname-$_kdever.tar.xz") -sha256sums=(`grep $pkgname-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) - -build() { - cd ${srcdir}/$pkgname-$pkgver - cmake . \ - -DCMAKE_BUILD_TYPE=${_build_type} \ - -DCMAKE_INSTALL_PREFIX=${_installprefix} \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install -} diff --git a/krfb/PKGBUILD b/krfb/PKGBUILD deleted file mode 100644 index 3f74c8f73..000000000 --- a/krfb/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: H W Tovetjärn (totte) -# Contributors: Manuel Tortosa - -# Include global configuration -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname="krfb" -arch=('x86_64') -pkgver=${_kdever} -pkgrel=1 -pkgdesc="Desktop Sharing Server" -# note on libxdamage: -# not detected by namcap because libgl depends on it -# but nvidia providing libgl does not depend on libxdamage -depends=("kde-runtime>=${_kdever}" "kdelibs>=${_kdever}" 'libvncserver' 'libxdamage') -groups=("kde" "kdenetwork" "kde-uninstall") -categories=('network') -conflicts=("kdenetwork-common" "kdenetwork-doc" "kdenetwork-krfb") -replaces=("kdenetwork-krfb") -provides=("kdenetwork-krfb") -install=kdenetwork.install -url="http://www.kde.org" -license=('GPL' 'LGPL' 'FDL') -options=('docs' '!header' 'debug' 'log') -makedepends=('pkg-config' 'cmake' 'automoc4' 'docbook-xsl') -source=("$_mirror/$pkgname-$_kdever.tar.xz") -sha256sums=(`grep $pkgname-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) - -build() { - cd ${srcdir}/$pkgname-$pkgver - cmake . \ - -DCMAKE_BUILD_TYPE=${_build_type} \ - -DCMAKE_INSTALL_PREFIX=${_installprefix} \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install -} diff --git a/krfb/kdenetwork.install b/krfb/kdenetwork.install deleted file mode 100644 index 4ae139dbd..000000000 --- a/krfb/kdenetwork.install +++ /dev/null @@ -1,88 +0,0 @@ -post_install() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-sycoca - fi - - if [ "$UPDATE_USER_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-user-sycoca - fi - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -post_upgrade() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-sycoca - fi - - if [ "$UPDATE_USER_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-user-sycoca - fi - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -post_remove() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-sycoca - fi - - if [ "$UPDATE_USER_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-user-sycoca - fi - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -op=$1 -shift - -$op $* -- GitLab