Prepare kde 4.6.4

This commit is contained in:
Manuel 2011-06-04 17:28:14 +00:00
parent e81da6b59c
commit 74d62ace73
3 changed files with 60 additions and 122 deletions

View File

@ -7,26 +7,20 @@
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# original name (used for the source and pkgnames)
_origname=kdebase-workspace
# default wallpaper to be kept in kdebase-workspace main package
_default_wp="Horos"
#
# package info
#
pkgbase=('kdebase-workspace')
pkgbase="kdebase-workspace"
pkgname=('kdebase-workspace'
'kdebase-workspace-doc'
'kdebase-workspace-wallpapers')
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=2
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"
@ -43,7 +37,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebinding
"kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba'
'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2')
source=($_mirror/${_origname}-$_kdever.tar.bz2
source=($_mirror/${pkgbase}-$_kdever.tar.bz2
mishaaq-kcm_touchpad-00370b5.tar.gz
http://www.kde-apps.org/CONTENT/content-files/114856-kcm_tablet-1.1.3.tar.gz
http://www.kde-apps.org/CONTENT/content-files/117639-favorites-0.1.tar.bz2
@ -99,7 +93,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
sensors-fix.patch
)
md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
'f355a658d2e9267fdf4e8d8f88038bcf' # mishaaq-kcm_touchpad-00370b5.tar.gz
'd4570491bcf9986d84aeb77c939090a9' # 114856-kcm_tablet-1.1.3.tar.gz
'b60baabccbd302d00923e053db0dc0ae' # 117639-favorites-0.1.tar.bz2
@ -114,20 +108,15 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
'e2eb9d270fe0e93901b29256bdedd7e2' # 02_sane_env_and_shutdown_path.patch
'8e623bb5608025417ff9ed061e5a03f1' # 03_plasma_menubutton_branding.patch
'522a294c09d88d3d722de3f39fd203c3' # 04_plasma_kickoff_url.patch
# '0aba9287f038d66afbf545c83a46fd19' # 05_plasma_desktop_defaults.patch
'0ee6e12bb9830b4248becb0442dc7e0c' # 06_kickoff_default_favourites.patch
'89d96455c6a446ef59b0620d1b8606af' # 07_always_show_kickoff_subtext.patch
'5eb9285268916492012151045bdebd26' # 09_enable_start-shutdown-scripts.patch
'db2d8166f5ea80ecd291deb9c0e2bb71' # fix_kdm-increase-xserver-timeout-bnc#462478.patch
'814350c52c135d6f7bdada1e29223d38' # fix_terminate-server.patch
# '5d752cf39a28306438bb6d82db6e1696'# fix_ck-shutdown.patch
'97a5eb51e6f9d460f0d61bb322a1db5e' # fix_kdm_configdef.patch
'5f963f80a026f0600edae1b1c70411e5' # fix_root-only-kcms.patch
# 'c6b58eb228d16c77d692df655046ee9f' # trunk_powerdevil.patch
# '13c3203589143e9e2fc757c17375227a' # feature_plasma-transparent-panel-v4-rb#472.patch
# '7361012da217f9aeeca61f0e9956e1d0' # feature_brightness-osd.patch
# '894815a80f99a9a0dee1adbcda49b161' # feature_battery-tooltip.patch
@ -142,17 +131,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
#
build()
{
cd ${srcdir}/${_origname}-${pkgver}
# branch update
if [ "$_branchupdate" = "yes" ] ; then
msg "applying branch update ..."
patch -p0 -i $startdir/branch-update-r*.patch
else
warning "branch updates disabled ..."
warning "if you want to make use of it, run branch_updater.sh"
warning "and enable branch updates in _/buildsystem/kdemod.conf"
fi
cd ${srcdir}/${pkgbase}-${pkgver}
msg "applying main patchset ..."
@ -160,7 +139,6 @@ build()
patch -Np0 -i ${srcdir}/02_sane_env_and_shutdown_path.patch
patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch
patch -Np1 -i ${srcdir}/04_plasma_kickoff_url.patch
# patch -Np1 -i ${srcdir}/05_plasma_desktop_defaults.patch
patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch
patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch
patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch
@ -169,10 +147,8 @@ build()
msg "applying fixes ..."
patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch
patch -Np0 -i ${srcdir}/fix_terminate-server.patch
# patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch
patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch
# patch -Np1 -i ${srcdir}/shutdown-fix.patch
# FIXME: update feature patches
# msg "applying feature patches ..."
@ -198,6 +174,8 @@ build()
msg "starting kcm_touchpad build ..."
cd ${srcdir}/mishaaq-kcm_touchpad-00370b5
# Fix desktop to the new layout
sed -i -e "s~keyboard-and-mouse~input-devices~g" touchpad.desktop
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
-DWITH_Xmms=OFF \
@ -206,6 +184,8 @@ build()
msg "starting kcm_tablet build ..."
cd ${srcdir}/kcm_tablet-1.1.3
# Fix desktop to the new layout
sed -i -e "s~keyboard-and-mouse~input-devices~g" ${srcdir}/kcm_tablet-1.1.3/src/kcm_tablet.desktop
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
-DWITH_Xmms=OFF \
@ -245,20 +225,20 @@ package_kdebase-workspace()
"gpsd : Plasma geolocation support"
"(open)ntp : Time/Date sync support")
provides=("${_origname}=${_kdever}" "powerdevil" 'powerdevil' 'kcm_tablet=1.1.3')
provides=('kde-workspace' 'powerdevil' 'kcm_tablet')
replaces=('guidance-power-manager')
conflicts=("kdemod-${_origname}" "powerdevil" 'powerdevil' "kde-meta-${_origname}" 'kcm_tablet' 'guidance-power-manager')
groups=("kde" "kde-complete" "kde-uninstall" "kde-minimal")
conflicts=('powerdevil' 'kcm_tablet' 'guidance-power-manager')
groups=("kde" "kde-uninstall" "kde-minimal")
backup=('usr/share/config/kdm/kdmrc'
'etc/pam.d/kde'
'etc/pam.d/kde-np'
'etc/pam.d/kscreensaver')
install=${_origname}.install
install=${pkgbase}.install
cd ${srcdir}/${_origname}-${pkgver}
cd ${srcdir}/${pkgbase}-${pkgver}
make DESTDIR=${pkgdir} install
cd ${srcdir}/mishaaq-kcm_touchpad-00370b5
@ -279,13 +259,13 @@ package_kdebase-workspace()
install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
# install session
install -D -m 644 ${srcdir}/${_origname}-${pkgver}/kdm/kfrontend/sessions/kde-plasma.desktop \
install -D -m 644 ${srcdir}/${pkgbase}-${pkgver}/kdm/kfrontend/sessions/kde-plasma.desktop \
${pkgdir}/etc/X11/sessions/kde-plasma.desktop
install -D -m 644 ${srcdir}/${_origname}-${pkgver}/kdm/kfrontend/sessions/kde-plasma-safe.desktop \
install -D -m 644 ${srcdir}/${pkgbase}-${pkgver}/kdm/kfrontend/sessions/kde-plasma-safe.desktop \
${pkgdir}/etc/X11/sessions/kde-plasma-safe.desktop
# also install kdm clean default config
cd ${srcdir}/${_origname}-${pkgver}/kdm
cd ${srcdir}/${pkgbase}-${pkgver}/kdm
make DESTDIR=${pkgdir} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
# povided in separate package
@ -330,10 +310,10 @@ package_kdebase-workspace()
ls -1 ${startdir}/*.patch &>/dev/null 2>&1
if [ "$?" = "0" ]; then
warning "incuding patches into package"
mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
for i in ${startdir}/*.patch; do
msg "$i"
cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
done
else
warning "no patches found, skipping to include them into the package..."
@ -348,13 +328,13 @@ package_kdebase-workspace()
package_kdebase-workspace-doc()
{
pkgdesc="KDE Workspace - Documentation"
groups=("kde" "kde-complete" "kde-uninstall" "kde-doc")
groups=("kde" "kde-uninstall" "kde-doc")
# keep this, the variable must be resetted
optdepends=()
splitdirs="doc"
for i in ${splitdirs} ; do
cd ${srcdir}/${_origname}-${pkgver}/${i}
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
make DESTDIR=${pkgdir} install
done
}
@ -362,13 +342,13 @@ package_kdebase-workspace-doc()
package_kdebase-workspace-wallpapers()
{
pkgdesc="KDE Workspace - Desktop Wallpapers"
groups=("kde" "kde-complete" "kde-uninstall")
groups=("kde" "kde-uninstall")
# keep this, the variable must be resetted
optdepends=()
splitdirs="wallpapers"
for i in ${splitdirs} ; do
cd ${srcdir}/${_origname}-${pkgver}/${i}
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
make DESTDIR=${pkgdir} install
done

View File

@ -7,26 +7,15 @@
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# original name (used for the source and pkgnames)
_origname=kdebindings
_ARCHITECTURE="$_arch"
#
# package info
#
pkgbase=('kdebindings')
pkgbase="kdebindings"
pkgname=('kdebindings-common'
'kdebindings-csharp'
'kdebindings-python'
'kdebindings-ruby')
# disabled:
# kdebindings-java
# kdebindings-php
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=1
@ -35,24 +24,21 @@ pkgdesc="split package"
url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL')
install=${_origname}.install
install=${pkgbase}.install
options=('docs' '!splithdr' 'splitdbg' 'log')
makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" 'pyqt>=4.8.1' 'qwt' 'qscintilla'
'ruby' 'mono' "kdegraphics-okular>=${_kdever}" "kdegraphics-common>=${_kdever}") # "kdepim-runtime>=${_kdever}"
source=("$_mirror/${_origname}-$_kdever.tar.bz2")
md5sums=("`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`")
source=("$_mirror/${pkgbase}-$_kdever.tar.bz2")
md5sums=("`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`")
#
# build function
#
build()
{
cd ${srcdir}/${_origname}-${pkgver}
#msg "applying upstream patches ..."
cd ${srcdir}/${pkgbase}-${pkgver}
msg "starting build ..."
export MONO_SHARED_DIR="${srcdir}/build/.mono"
@ -70,8 +56,6 @@ build()
make || return 1
}
#
# split-install functions
#
@ -79,20 +63,19 @@ package_kdebindings-common()
{
pkgdesc="KDE Bindings - Common files and libraries"
depends=("kdelibs>=${_kdever}" "kdepimlibs>=${_kdever}" 'qscintilla' 'qimageblitz')
conflicts=("kdemod-${_origname}")
groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
groups=("kde" "kde-devel" "${pkgbase}" "kde-uninstall")
splitdirs="smoke"
for i in ${splitdirs} ; do
cd ${srcdir}/${_origname}-${pkgver}/${i}
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
make DESTDIR=${pkgdir} install || return 1
done
# # include our patches into the package
# include our patches into the package
# ls -1 ${startdir}/*.patch &>/dev/null 2>&1
# if [ "$?" = "0" ]; then
# warning "incuding patches into package"
# mkdir -p ${pkgdir}/usr/share/chakra/patches/${_origname} &>/dev/null
# mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
# for i in ${startdir}/*.patch; do
# msg "$i"
# done
@ -104,55 +87,26 @@ package_kdebindings-common()
package_kdebindings-csharp()
{
pkgdesc="KDE Bindings - C#"
depends=("${_origname}-common>=${_kdever}" 'mono')
groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
conflicts=("kdemod-${_origname}-chsharp=${_kdever}")
depends=("${pkgbase}-common>=${_kdever}" 'mono')
groups=("kde" "kde-devel" "${pkgbase}" "kde-uninstall")
splitdirs="csharp"
for i in ${splitdirs} ; do
cd ${srcdir}/${_origname}-${pkgver}/${i}
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
make DESTDIR=${pkgdir} install || return 1
done
}
package_kdebindings-java()
{
pkgdesc="KDE Bindings - Java"
depends=("${_origname}-common>=${_kdever}")
groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
conflicts=("kdemod-${_origname}-java=${_kdever}")
splitdirs="java"
for i in ${splitdirs} ; do
cd ${srcdir}/${_origname}-${pkgver}/${i}
make DESTDIR=${pkgdir} install || return 1
done
}
package_kdebindings-php()
{
pkgdesc="KDE Bindings - PHP"
depends=("${_origname}-common>=${_kdever}")
groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
conflicts=("kdemod-${_origname}-php=${_kdever}")
splitdirs="php"
for i in ${splitdirs} ; do
cd ${srcdir}/${_origname}-${pkgver}/${i}
make DESTDIR=${pkgdir} install || return 1
done
}
package_kdebindings-python()
{
pkgdesc="KDE Bindings - Python"
depends=("${_origname}-common>=${_kdever}" "kdepimlibs>=${_kdever}" 'pyqt>=4.8.1' 'qscintilla') # "kdepim-runtime>=${_kdever}"
conflicts=("kdemod-${_origname}-python=${_kdever}")
groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
depends=("${pkgbase}-common>=${_kdever}" "kdepimlibs>=${_kdever}" 'pyqt>=4.8.1' 'qscintilla') # "kdepim-runtime>=${_kdever}"
groups=("kde" "kde-devel" "${pkgbase}" "kde-uninstall")
splitdirs="python"
for i in ${splitdirs} ; do
cd ${srcdir}/${_origname}-${pkgver}/${i}
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
make DESTDIR=${pkgdir} install || return 1
done
}
@ -160,13 +114,12 @@ package_kdebindings-python()
package_kdebindings-ruby()
{
pkgdesc="KDE Bindings - Ruby"
depends=("${_origname}-common>=${_kdever}" 'ruby')
conflicts=("kdemod-${_origname}-ruby=${_kdever}")
groups=("kde" "kde-devel" "${_origname}" "kde-uninstall")
depends=("${pkgbase}-common>=${_kdever}" 'ruby')
groups=("kde" "kde-devel" "${pkgbase}" "kde-uninstall")
splitdirs="ruby"
for i in ${splitdirs} ; do
cd ${srcdir}/${_origname}-${pkgver}/${i}
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
make DESTDIR=${pkgdir} install || return 1
done
}

View File

@ -75,22 +75,27 @@ package_kdegraphics-common()
make DESTDIR=${pkgdir} install || return 1
done
# Fix duplicated docs in 4.6.4
sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kgamma/common
sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kgamma/index.cache.bz2
sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kgamma/index.docbook
# WORKAROUND -> install cmake modules
#install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
# $pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
$pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
# include our patches into the package
ls -1 ${startdir}/* | grep patch &>/dev/null 2>&1
if [ "${?}" = "0" ]; then
warning "incuding patches into package"
mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
for i in ${startdir}/*.patch; do
msg "$i"
cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
done
else
warning "no patches found, skipping to include them into the package..."
fi
# ls -1 ${startdir}/* | grep "patch" &>/dev/null 2>&1
# if [ "$?" = "0" ]; then
# warning "incuding patches into package"
# mkdir -p ${pkgdir}/usr/share/chakra/patches/${pkgbase} &>/dev/null
# for i in ${startdir}/*.patch; do
# msg "$i"
# cp $i ${pkgdir}/usr/share/chakra/patches/${pkgbase}/ &>/dev/null
# done
#else
# warning "no patches found, skipping to include them into the package..."
#fi
}
package_kdegraphics-doc()
@ -132,7 +137,7 @@ package_kdegraphics-kamera()
make DESTDIR=${pkgdir} install || return 1
done
# Fix duplicated docs in 4.6.3
# Fix duplicated docs in 4.6.4
sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/common
sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.cache.bz2
sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.docbook