diff --git a/kde-sc.md5 b/kde-sc.md5 index 0b5afc5fd..9a4392f32 100644 --- a/kde-sc.md5 +++ b/kde-sc.md5 @@ -3,11 +3,11 @@ f7011751bf9e8b33f6c2f7ed0de01a88 kdeadmin-4.6.2.tar.bz2 43ddb06238120efc29614d8268dc4dff kdeartwork-4.6.2.tar.bz2 80b02b96deb1057a7eff5ec691765110 kdebase-4.6.2.tar.bz2 541029e6a62a8cecade97fb8106d17a8 kdebase-runtime-4.6.2.tar.bz2 -0cc795bb58aa4841b90717ee4436ce96 kdebase-workspace-4.6.2.tar.bz2 -358272911af2bf1ff76aca8a43358047 kdebindings-4.6.2.tar.bz2 +c544190b7f145df58f0e0bad5b46e0b3 kdebase-workspace-4.6.2.tar.bz2 +48f9d1159153224e28e7d97255cbb921 kdebindings-4.6.2.tar.bz2 282a7fdd582718575e376e033ec8a049 kdeedu-4.6.2.tar.bz2 56f676e7bdb4475ea9ff9b08c443e919 kdegames-4.6.2.tar.bz2 -db3519433c9a91dbc4f1ba68d824d328 kdegraphics-4.6.2.tar.bz2 +3aca3c307b745e7a6f6dd6b137600bdb kdegraphics-4.6.2.tar.bz2 e6bd12a9701082f12454430c9779b4b8 kde-l10n-ar-4.6.2.tar.bz2 0743f1164a5f86aff2ce5882fac3f513 kde-l10n-bg-4.6.2.tar.bz2 b77aa5f347038ec6a0bf22d9ce35a884 kde-l10n-ca-4.6.2.tar.bz2 diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD index abba01ec3..c4a881cbe 100644 --- a/kdebase-workspace/PKGBUILD +++ b/kdebase-workspace/PKGBUILD @@ -26,7 +26,7 @@ pkgname=('kdebase-workspace' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=1 +pkgrel=3 pkgdesc="split package" url="http://www.kde.org" @@ -78,7 +78,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2 fix_kdm_configdef.patch # "fix" some sytemsettings modules that need root access - fix_root-only-kcms.patch) + fix_root-only-kcms.patch # fix powerdevil # trunk_powerdevil.patch @@ -96,6 +96,9 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2 # feature_history-notifications-enable-disable-kde#119207.patch # feature_kdm-plymouth.patch + shutdown-fix.patch + sensors-fix.patch + ) md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` 'f355a658d2e9267fdf4e8d8f88038bcf' # mishaaq-kcm_touchpad-00370b5.tar.gz @@ -121,7 +124,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` '814350c52c135d6f7bdada1e29223d38' # fix_terminate-server.patch # '5d752cf39a28306438bb6d82db6e1696'# fix_ck-shutdown.patch '97a5eb51e6f9d460f0d61bb322a1db5e' # fix_kdm_configdef.patch - '5f963f80a026f0600edae1b1c70411e5') # fix_root-only-kcms.patch + '5f963f80a026f0600edae1b1c70411e5' # fix_root-only-kcms.patch # 'c6b58eb228d16c77d692df655046ee9f' # trunk_powerdevil.patch @@ -131,6 +134,9 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` # '894815a80f99a9a0dee1adbcda49b161' # feature_battery-tooltip.patch # '9b97ac1b4deb8d0c8ca7afffb80b4320' # feature_history-notifications-enable-disable-kde#119207.patch # '42b3b5e09372c57910c3435e63e2dfd6' # feature_kdm-plymouth.patch + 'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch + 'ecf3a9d6af9bdd3db0189e06ddf21034' # sensors-fix.patch + ) # # build function @@ -142,7 +148,7 @@ build() # branch update if [ "$_branchupdate" = "yes" ] ; then msg "applying branch update ..." - patch -p0 -i $startdir/branch-update-r*.patch || return 1 + 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" @@ -151,32 +157,34 @@ build() msg "applying main patchset ..." - patch -Np0 -i ${srcdir}/01_kdm_zsh_profile.patch || return 1 - patch -Np0 -i ${srcdir}/02_sane_env_and_shutdown_path.patch || return 1 - patch -Np1 -i ${srcdir}/03_plasma_menubutton_branding.patch || return 1 - patch -Np1 -i ${srcdir}/04_plasma_kickoff_url.patch || return 1 -# patch -Np1 -i ${srcdir}/05_plasma_desktop_defaults.patch || return 1 - patch -Np1 -i ${srcdir}/06_kickoff_default_favourites.patch || return 1 - patch -Np1 -i ${srcdir}/07_always_show_kickoff_subtext.patch || return 1 - patch -Np1 -i ${srcdir}/09_enable_start-shutdown-scripts.patch || return 1 + patch -Np0 -i ${srcdir}/01_kdm_zsh_profile.patch + 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 msg "applying fixes ..." - patch -Np0 -i ${srcdir}/fix_kdm-increase-xserver-timeout-bnc#462478.patch || return 1 - patch -Np0 -i ${srcdir}/fix_terminate-server.patch || return 1 -# patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch || return 1 - patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch || return 1 - patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch || return 1 + 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 ..." -# patch -Np1 -i ${srcdir}/feature_plasma-transparent-panel-v4-rb#472.patch || return 1 -# patch -Np1 -i ${srcdir}/feature_brightness-osd.patch || return 1 -# patch -Np1 -i ${srcdir}/feature_battery-tooltip.patch || return 1 -# patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch || return 1 -# patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch || return 1 +# patch -Np1 -i ${srcdir}/feature_plasma-transparent-panel-v4-rb#472.patch +# patch -Np1 -i ${srcdir}/feature_brightness-osd.patch +# patch -Np1 -i ${srcdir}/feature_battery-tooltip.patch +# patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch +# patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch -# msg "applying chakra patches ..." + msg "applying upstream patches ..." + patch -Np1 -i ${srcdir}/sensors-fix.patch msg "starting workspace build ..." @@ -187,7 +195,7 @@ build() -DWITH_PolkitQt=OFF \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' - make || return 1 + make msg "starting kcm_touchpad build ..." cd ${srcdir}/mishaaq-kcm_touchpad-00370b5 @@ -213,7 +221,7 @@ build() -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' - make || return 1 + make } @@ -252,16 +260,16 @@ package_kdebase-workspace() install=${_origname}.install cd ${srcdir}/${_origname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install cd ${srcdir}/mishaaq-kcm_touchpad-00370b5 - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install cd ${srcdir}/kcm_tablet-1.1.3 - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install cd ${srcdir}/favorites-0.1 - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install # install pam configuration install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde @@ -349,7 +357,7 @@ package_kdebase-workspace-doc() splitdirs="doc" for i in ${splitdirs} ; do cd ${srcdir}/${_origname}-${pkgver}/${i} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install done } @@ -363,7 +371,7 @@ package_kdebase-workspace-wallpapers() splitdirs="wallpapers" for i in ${splitdirs} ; do cd ${srcdir}/${_origname}-${pkgver}/${i} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install done rm -rfv ${pkgdir}/usr/share/wallpapers/${_default_wp} diff --git a/kdebase-workspace/fix-null-pointer-crash.patch b/kdebase-workspace/fix-null-pointer-crash.patch new file mode 100644 index 000000000..5d66871d7 --- /dev/null +++ b/kdebase-workspace/fix-null-pointer-crash.patch @@ -0,0 +1,34 @@ +From: Andriy Rysin +Date: Sun, 03 Apr 2011 02:27:37 +0000 +Subject: Fix null pointer crash when no rules found; add unit test +X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=754b4aee80ef521433c8179bca122c22135f5118 +--- +Fix null pointer crash when no rules found; add unit test +BUG: 269961 +--- + + +--- a/kcontrol/keyboard/flags.cpp ++++ b/kcontrol/keyboard/flags.cpp +@@ -136,7 +136,7 @@ static QString getDisplayText(const QStr + { + if( variant.isEmpty() ) + return layout; +- if( rules->version == "1.0" ) ++ if( rules == NULL || rules->version == "1.0" ) + return i18nc("layout - variant", "%1 - %2", layout, variant); + return variant; + } + +--- a/kcontrol/keyboard/tests/flags_test.cpp ++++ b/kcontrol/keyboard/tests/flags_test.cpp +@@ -82,6 +82,9 @@ private Q_SLOTS: + QVERIFY( flags->getLongText(layoutUnit1, rules).startsWith("USA - International") ); + QCOMPARE( flags->getLongText(layoutUnit2, rules), QString("USA - other") ); + ++ rules = NULL; // when no rules found ++ QCOMPARE( flags->getLongText(layoutUnit1, rules), QString("us - intl") ); ++ + flags->clearCache(); + } + diff --git a/kdebase-workspace/sensors-fix.patch b/kdebase-workspace/sensors-fix.patch new file mode 100644 index 000000000..2d9b70c52 --- /dev/null +++ b/kdebase-workspace/sensors-fix.patch @@ -0,0 +1,22 @@ +commit 23863a99399cbb274f6756146b3c08de2efa0c7f +Author: John Tapsell +Date: Thu Apr 7 10:59:20 2011 +0100 + + Fix accidental removal of a #include, when adding freebsd support. This broke the lmsensors at minimum + + BUG: 270246 + BUG: 270246 + CCMAIL: naylor.b.david@gmail.com + +diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h +index e780be6..9aae890 100644 +--- a/ksysguard/ksysguardd/modules.h ++++ b/ksysguard/ksysguardd/modules.h +@@ -23,6 +23,7 @@ + #ifndef KSG_MODULES_H + #define KSG_MODULES_H + ++#include "config-ksysguardd.h" + #include "Command.h" + #include "conf.h" + #include "ksysguardd.h" diff --git a/kdebase-workspace/shutdown-fix.patch b/kdebase-workspace/shutdown-fix.patch new file mode 100644 index 000000000..b01ab7fba --- /dev/null +++ b/kdebase-workspace/shutdown-fix.patch @@ -0,0 +1,11 @@ +--- kdebase-workspace-4.6.2/kdm/config.def~ 2011-04-08 00:29:48.291941154 -0700 ++++ kdebase-workspace-4.6.2/kdm/config.def 2011-04-08 00:32:04.738607619 -0700 +@@ -38,7 +38,7 @@ + # define HALT_CMD "/usr/sbin/shutdown -h now" + # define REBOOT_CMD "/usr/sbin/shutdown -r now" + #elif defined(BSD) || defined(__linux__) +-# define HALT_CMD "/sbin/shutdown -p now" ++# define HALT_CMD "/sbin/shutdown -h now" + # define REBOOT_CMD "/sbin/shutdown -r now" + #elif defined(__SVR4) + # define HALT_CMD "/usr/sbin/halt" diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD index 868e23978..8b4723cee 100644 --- a/kdebase/PKGBUILD +++ b/kdebase/PKGBUILD @@ -27,7 +27,7 @@ pkgname=('kdebase' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=1 +pkgrel=4 pkgdesc="split package" url="http://www.kde.org" @@ -104,11 +104,42 @@ package_kdebase() groups=("kde" "kde-minimal" "kde-complete" "kde-uninstall") install=${_origname}.install - splitdirs="kdepasswd kdialog keditbookmarks kfind lib nsplugins plasma" #kinfocenter + splitdirs="kdepasswd kdialog keditbookmarks kfind lib nsplugins plasma konqueror" #kinfocenter for i in ${splitdirs} ; do cd ${srcdir}/${_origname}-${pkgver}/${i} make DESTDIR=${pkgdir} install || return 1 done + + # prepare konqueror + msg "splitting konqueror ..." + rm -vR ${pkgdir}/usr/include/konqsidebarplugin.h + rm -vR ${pkgdir}/usr/lib/libkonqsidebarplugin.so* + rm -vR ${pkgdir}/usr/lib/libkdeinit4_konqueror.so + rm -vR ${pkgdir}/usr/lib/libkonquerorprivate.so* + rm -vR ${pkgdir}/usr/lib/kde4/konq_aboutpage.so + rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_web.so + rm -vR ${pkgdir}/usr/lib/kde4/konq_sidebartree_bookmarks.so + rm -vR ${pkgdir}/usr/lib/kde4/konq_sidebartree_dirtree.so + rm -vR ${pkgdir}/usr/lib/kde4/konq_sidebar.so + rm -vR ${pkgdir}/usr/lib/kde4/khtmlkttsdplugin.so + rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_history.so + rm -vR ${pkgdir}/usr/lib/kde4/kded_konqy_preloader.so + rm -vR ${pkgdir}/usr/lib/kde4/konq_shellcmdplugin.so + rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_places.so + rm -vR ${pkgdir}/usr/lib/kde4/konqsidebar_tree.so + rm -vR ${pkgdir}/usr/share/config/konqsidebartngrc + rm -vR ${pkgdir}/usr/share/config.kcfg/konqueror.kcfg + rm -vR ${pkgdir}/usr/share/autostart/konqy_preload.desktop + rm -vR ${pkgdir}/usr/share/applications/kde4/konquerorsu.desktop + rm -vR ${pkgdir}/usr/share/applications/kde4/konqbrowser.desktop + rm -vR ${pkgdir}/usr/share/apps/kwebkitpart + rm -vR ${pkgdir}/usr/share/apps/konqsidebartng + rm -vR ${pkgdir}/usr/share/apps/konqueror + rm -vR ${pkgdir}/usr/share/apps/khtml + rm -vR ${pkgdir}/usr/share/icons/ + rm -vR ${pkgdir}/usr/share/dbus-1/interfaces/org.kde.Konq* + rm -vR ${pkgdir}/usr/share/dbus-1/interfaces/org.kde.konq* + rm -vR ${pkgdir}/usr/bin/konqueror # install cdemu frontend cd ${srcdir}/kde_cdemu-0.3 @@ -177,6 +208,24 @@ package_kdebase-konqueror() cd ${srcdir}/${_origname}-${pkgver}/${i} make DESTDIR=${pkgdir} install || return 1 done + + msg "remove conflicting files ..." + rm -vR ${pkgdir}/usr/bin/kfmclient + rm -vR ${pkgdir}/usr/lib/kde4/kcm_history.so + rm -vR ${pkgdir}/usr/lib/kde4/kcm_kio.so + rm -vR ${pkgdir}/usr/lib/kde4/kcm_konq.so + rm -vR ${pkgdir}/usr/lib/kde4/kcm_konqhtml.so + rm -vR ${pkgdir}/usr/lib/kde4/kcm_kurifilt.so + rm -vR ${pkgdir}/usr/lib/kde4/kcm_performance.so + rm -vR ${pkgdir}/usr/lib/libkdeinit4_kfmclient.so + rm -vR ${pkgdir}/usr/share/applications/kde4/Home.desktop + rm -vR ${pkgdir}/usr/share/applications/kde4/kfmclient* + rm -vR ${pkgdir}/usr/share/apps/dolphinpart/kpartplugins/kshellcmdplugin* + rm -vR ${pkgdir}/usr/share/apps/kcmcss/template.css + rm -vR ${pkgdir}/usr/share/apps/kconf_update/kfmclient* + rm -vR ${pkgdir}/usr/share/apps/kcontrol/pics/onlyone.png + rm -vR ${pkgdir}/usr/share/apps/kcontrol/pics/overlapping.png + rm -vR ${pkgdir}/usr/share/kde4/service* } package_kdebase-konsole() diff --git a/kdebindings/PKGBUILD b/kdebindings/PKGBUILD index e56a848ea..040d091ce 100644 --- a/kdebindings/PKGBUILD +++ b/kdebindings/PKGBUILD @@ -29,7 +29,7 @@ pkgname=('kdebindings-common' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=1 +pkgrel=2 pkgdesc="split package" url="http://www.kde.org" @@ -41,11 +41,9 @@ 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" - "fix_phonon_includes.diff") +source=("$_mirror/${_origname}-$_kdever.tar.bz2") -md5sums=("`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`" - 'bdc1a18d9e4e4686cbb680e824cd6a8b') +md5sums=("`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`") # # build function @@ -54,8 +52,7 @@ build() { cd ${srcdir}/${_origname}-${pkgver} - msg "applying upstream patches ..." - patch -Np2 -i ${startdir}/fix_phonon_includes.diff + #msg "applying upstream patches ..." msg "starting build ..." export MONO_SHARED_DIR="${srcdir}/build/.mono" diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD index 97fcb1bb1..1e06019b0 100644 --- a/kdegraphics/PKGBUILD +++ b/kdegraphics/PKGBUILD @@ -30,7 +30,7 @@ pkgname=('kdegraphics-common' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=1 +pkgrel=2 pkgdesc="split package" url="http://www.kde.org" @@ -42,13 +42,9 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" "kdebase-runti 'poppler-qt' 'libspectre' 'sane' 'chmlib' 'libdjvu' 'lcms' 'qca' 'qimageblitz' 'ebook-tools' 'libxxf86vm') -source=("$_mirror/${_origname}-$_kdever.tar.bz2" - fix-kruler-docs.diff - fix-ksnapshot-docs.diff) +source=("$_mirror/${_origname}-$_kdever.tar.bz2") -md5sums=("`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`" - '5a00ce9c73737ee109d7a0c9fb0b43db' - '4f24ab2693b24214ed68eff2ef80a5b2') +md5sums=("`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`") # # build function @@ -56,9 +52,7 @@ md5sums=("`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`" build() { cd ${srcdir}/${_origname}-${pkgver} - msg "apply patches ..." - patch -Np2 -i ${startdir}/fix-kruler-docs.diff - patch -Np2 -i ${startdir}/fix-ksnapshot-docs.diff + #msg "apply patches ..." msg "starting build ..." cmake . -DCMAKE_BUILD_TYPE=${_build_type} \ diff --git a/koffice-l10n/PKGBUILD b/koffice-l10n/PKGBUILD index d6cec12a8..ad2337a75 100644 --- a/koffice-l10n/PKGBUILD +++ b/koffice-l10n/PKGBUILD @@ -35,7 +35,7 @@ pkgname=('koffice-l10n-ca' 'koffice-l10n-zh_cn' 'koffice-l10n-zh_tw') pkgver=2.3.2 -pkgrel=1 +pkgrel=2 arch=('any') url='http://www.koffice.org' license=('GPL') @@ -366,6 +366,9 @@ package_koffice-l10n-hu() { pkgdesc=('Hungarian Localization for Koffice') cd $srcdir/build/gl make DESTDIR=$pkgdir install + # temp fix + rm -vR $pkgdir/usr/share/locale/gl + rm -vR $pkgdir/usr/share/doc/kde/html/gl } package_koffice-l10n-it() { pkgdesc=('Italian Localization for Koffice') @@ -401,6 +404,9 @@ package_koffice-l10n-pl() { pkgdesc=('Polish Localization for Koffice') cd $srcdir/build/gl make DESTDIR=$pkgdir install + # temp fix + rm -vR $pkgdir/usr/share/locale/gl + rm -vR $pkgdir/usr/share/doc/kde/html/gl } package_koffice-l10n-pt() { pkgdesc=('Portugese Localization for Koffice') diff --git a/oxygen-icons/PKGBUILD b/oxygen-icons/PKGBUILD index b6f3202a3..c2b3341f1 100644 --- a/oxygen-icons/PKGBUILD +++ b/oxygen-icons/PKGBUILD @@ -35,7 +35,6 @@ makedepends=('pkgconfig' 'cmake' 'automoc4') source=($_mirror/${_origname}-$_kdever.tar.bz2 http://chakra-project.org/source/icons/oxygencolors-addon.tar.gz) - md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` 'da971d7e2c862a6f77fb310a289f5529') # ../_sources/oxygencolors-addon.tar.gz diff --git a/support-pkg-akonadi/PKGBUILD b/support-pkg-akonadi/PKGBUILD index 9945a1f20..c32c415d9 100644 --- a/support-pkg-akonadi/PKGBUILD +++ b/support-pkg-akonadi/PKGBUILD @@ -8,18 +8,18 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=akonadi -pkgver=1.5.1 -pkgrel=3 +pkgver=1.5.2 +pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') url='http://www.akonadi-project.org' license=('LGPL') -depends=('shared-mime-info' 'boost' 'mysql>=5.5.10' 'soprano>=2.6.0') +depends=('shared-mime-info' 'boost' 'mysql>=5.5.11' 'soprano>=2.6.0') makedepends=('pkgconfig' 'cmake' 'automoc4') install=$pkgname.install source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2" 'qt-plugins-path.patch') -md5sums=('4225b064cac6553c22cbeca9a8f93c25' +md5sums=('1c69a74474389e35709171a329c77bed' '9e8ad893d8e8d7af2c4f89429e32e367') build() { diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index 2244b0fe7..7cdbef1cb 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -3,34 +3,34 @@ # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626 pkgname=appset-qt -pkgver=0.3.4 +pkgver=0.4.0 pkgrel=1 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') url="http://appset.sourceforge.net/" license=('GPL2') depends=('qt>=4.7') -optdepends=('kdebase-konqueror: For displaying Webpages in fullscreen') +optdepends=('ccr: For Community Repository support') install=${pkgname}.install -source=(http://sourceforge.net/projects/appset/files/appset-qt/0.3/$pkgver/$pkgname-$pkgver-sources.tar.gz +source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz - http://chakra-project.org/sources/$pkgname/$pkgname-0.3.4-chakra.patch - http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.3.4.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_de-0.3.4.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_el-0.3.4.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_es-0.3.4.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.3.4.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.3.4.tar.gz + http://chakra-project.org/sources/$pkgname/$pkgname-0.4.0-chakra.patch + http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.0.tar.gz ) -md5sums=(4a9ec4a56c74546b36e3f31907f23451 +md5sums=(4d0500ae33c8250dfa24c9b696ba7e30 87f5f278e3fe67ed2cd6165c2835d81b - 05f82efd3a7e47fb2cc3102256192f9a - 6f37f7de93cb47d9e2be3f2f809dcebf #appset-qt_ca-0.3.4.tar.gz - c26fbdf66017be1fbc0029d2d12eb159 #appset-qt_de-0.3.4.tar.gz - 2cd1cc98bc6d4feebc5e71f2d734eea7 #appset-qt_el-0.3.4.tar.gz - e9af00b142394ce29c538a0afdba2edb #appset-qt_es-0.3.4.tar.gz - 841602055447876d96e2740b0473b9bf #appset-qt_fr-0.3.4.tar.gz - 71be1071886dd14ab2e81ee635472233 #appset-qt_nl-0.3.4.tar.gz + 724e4cea62d3b95dd63573e75dffe783 + 44ba1b52c438e05853fbaf202ae243b6 #appset-qt_ca-0.4.0.tar.gz + 3b5c5027609eef9b43ad0f98c137c094 #appset-qt_de-0.4.0.tar.gz + 84542e24121e93dc1c84b63c940c60e0 #appset-qt_el-0.4.0.tar.gz + ffb9f62a72805a1613a8847598e353ea #appset-qt_es-0.4.0.tar.gz + f64d3552553bf28d12358aba2db4ca2a #appset-qt_fr-0.4.0.tar.gz + b9238caf3c0bf3f7f2258c052d8addf6 #appset-qt_nl-0.4.0.tar.gz ) build() { @@ -39,7 +39,7 @@ build() { cp -v ../*png Qt/AppSet-Qt # patch it for Chakra GNU/Linux - patch -Np1 -i ${startdir}/src/$pkgname-0.3.4-chakra.patch + patch -Np1 -i ${startdir}/src/$pkgname-0.4.0-chakra.patch # add chakra translations (check upstream) #patch -Np1 -i ${startdir}/src/add-spanish.patch diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD index ac82f8fdc..cc80a3f05 100644 --- a/tools-pkg-cbundle/PKGBUILD +++ b/tools-pkg-cbundle/PKGBUILD @@ -5,7 +5,7 @@ # (c) 2010 Drake Justice pkgname=cbundle -pkgver=0.4.5 +pkgver=0.4.5.1 pkgrel=1 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse') makedepends=('qt' 'automoc4' 'kdebase-workspace') @@ -15,13 +15,13 @@ license=('GPL') url="http://chakra-project.org/" source=("http://chakra-project.org/sources/cinstall/cbundle-$pkgver.tar.xz") -md5sums=('0c762b2fd4219a48b413bb46f23d828b') +md5sums=('70ba09e13b952d8199ad373735088792') # create tarball: source PKGBUILD && mksource mksource() { git clone git://gitorious.org/chakra/cbundle.git - pushd jmc-88-cbundle + pushd cbundle popd tar -cvJf cbundle-${pkgver}.tar.xz cbundle/* md5sum cbundle-${pkgver}.tar.xz diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD index dcdf4158a..37ebe8a3a 100644 --- a/tools-pkg-cinstall/PKGBUILD +++ b/tools-pkg-cinstall/PKGBUILD @@ -6,7 +6,7 @@ # (c) 2010 Drake Justice pkgname=cinstall -pkgver=0.4.5 +pkgver=0.4.5.1 pkgrel=1 depends=('rsync' 'cbundle') makedepends=('kdelibs' 'qt' 'automoc4') @@ -17,7 +17,7 @@ install=$pkgname.install url="http://chakra-project.org/" source=("http://chakra-project.org/sources/cinstall/cinstall-$pkgver.tar.xz") -md5sums=('9d5cb8aeddfcc9675ff2235bd2139890') +md5sums=('05dc73ea2a2fca80cc55729295053e8b') # create tarball: source PKGBUILD && mksource diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD index 406f2e910..5e4c19967 100644 --- a/tools-pkg-tribe/PKGBUILD +++ b/tools-pkg-tribe/PKGBUILD @@ -8,29 +8,25 @@ # package info # pkgname=tribe -pkgver=2011.04 -pkgrel=ms3.20110325 +pkgver=2011.04_ms4 +pkgrel=2 _codename=Aida pkgdesc="Tribe - Chakra LiveCD Installer" url="http://git.chakra-project.org/chakra/" license="GPL" arch=('i686' 'x86_64') -depends=('kdelibs' 'kdeedu-marble>=4.6.1' 'squashfs-tools' 'partitionmanager>=1216949-3' - 'cinstall>=0.4.1' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs') -makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.1' 'kdebase-workspace') +depends=('kdelibs' 'kdeedu-marble>=4.6.2' 'squashfs-tools' 'partitionmanager>=1216949-4' + 'cinstall>=0.4.5' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs') +makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.2' 'kdebase-workspace' 'automoc4') provides=('tribe') replaces=('kdemod-tribe-svn' 'kdemod-tribe') conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager') options=('!splithdr' '!splitdbg' 'sign') source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz" - "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS3.html" - "http://chakra-project.org/sources/tribe/configPageBundleData-i686" - "http://chakra-project.org/sources/tribe/configPageBundleData-x86_64") + "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS4.html") -md5sums=('ba92554ea90074b7e2f77c737fe35849' - 'e35cc70e87250559edfe952e46b6b994' - 'd8a2440c030405a4be214fc0c8995640' - '99b99d7454dbd1c2fcbbd6830928cab2') +md5sums=('34146b44bd0425f72c12a2c101a04b62' + '77351a268878e2a493bfd8c89fac1e41') groups=('kde-uninstall') install=tools-tribe.install @@ -61,7 +57,7 @@ build() sed -i -e "s~sudo~kdesu~g" "${srcdir}/$pkgname/tribe.desktop" # patches - #patch -Np1 -i ${srcdir}/oops.patch || return 1 + #patch -Np1 -i ${srcdir}/fake-progress.patch || return 1 #patch -Np1 -i ${startdir}/2011.03-1.patch || return 1 # remove unsupported pkgs for x64 @@ -89,12 +85,8 @@ package() cd "${srcdir}/$pkgname" msg "Make successful, installing..." make DESTDIR=$startdir/pkg install || return 1 - cp -vf ${srcdir}/RELEASE_NOTES_201104MS3.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html + cp -vf ${srcdir}/RELEASE_NOTES_201104MS4.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html # remove nasty files find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} + - - # workaround for bundles issue - cp -v ${srcdir}/configPageBundleData-${CARCH} ${pkgdir}/usr/share/tribe/config/configPageBundleData - rename .png -testing.png ${pkgdir}/usr/share/tribe/config/* } \ No newline at end of file