Merge testing

This commit is contained in:
Manuel 2011-05-11 01:09:42 +02:00
commit b2585e7271
26 changed files with 205 additions and 204 deletions

View File

@ -3,7 +3,7 @@
#
post_install() {
echo " "
echo " > KDE Software Compilation 4.6.2"
echo " > KDE Software Compilation 4.6.3"
echo " > packaged by the Chakra Project"
echo " "
echo " Installation Prefix : /usr"

View File

@ -1,73 +1,74 @@
c5eea7caa763bdd2a4c695eed2413006 kdeaccessibility-4.6.2.tar.bz2
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
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
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
0136d5798d45867637b33fb1fdb2e5f5 kde-l10n-ca@valencia-4.6.2.tar.bz2
e23a88175c0fbf8bd7c9c728907ded5a kde-l10n-cs-4.6.2.tar.bz2
665c1952c767b882cb102133312d0f60 kde-l10n-da-4.6.2.tar.bz2
5d45b827275d9bd9588213c9092c9ae0 kde-l10n-de-4.6.2.tar.bz2
e66b4a7e4fc952bc93c820fee3e9fc5b kde-l10n-el-4.6.2.tar.bz2
0abb46c540f0392f99325d4d14bb1314 kde-l10n-en_GB-4.6.2.tar.bz2
36751b8b89b720d914805633b38dd1d8 kde-l10n-es-4.6.2.tar.bz2
d2d24d1f88d1d93886fcfa508276d5d1 kde-l10n-et-4.6.2.tar.bz2
60fa3bc214e92dd330f7b6f8b042ed3f kde-l10n-eu-4.6.2.tar.bz2
5dcd941588632b07aaf566e0788a1884 kde-l10n-fi-4.6.2.tar.bz2
0fca80598686ba7e0aaeed3f2c1d8680 kde-l10n-fr-4.6.2.tar.bz2
b569a769bd3f23c6008606175bae85d3 kde-l10n-ga-4.6.2.tar.bz2
136724fcb34e8f671085f2def9cbba89 kde-l10n-gl-4.6.2.tar.bz2
53fdce94c526042e1a5d8ffdec783813 kde-l10n-gu-4.6.2.tar.bz2
35711578a9a3c0f69103e4e2c12d53f2 kde-l10n-he-4.6.2.tar.bz2
87ef3687e72b2773a9fe60c0602f2484 kde-l10n-hi-4.6.2.tar.bz2
2a3efa050ac5682bc25f85bcdf7b8cdc kde-l10n-hr-4.6.2.tar.bz2
f16403e270d06132472c8edf5f9a6a12 kde-l10n-hu-4.6.2.tar.bz2
6112f2b93cc0405680a646d0b5144f95 kde-l10n-ia-4.6.2.tar.bz2
dd2e1ea40806ccc80c4b0a4d85497594 kde-l10n-id-4.6.2.tar.bz2
bb6a596cb19eda100738be4ddc3e0565 kde-l10n-is-4.6.2.tar.bz2
f5b2770a63cd179f0ebacf459a0fc87a kde-l10n-it-4.6.2.tar.bz2
fe555c88234be91171db2a02d351872f kde-l10n-ja-4.6.2.tar.bz2
ee42ed12ec851f27f28fc96051aa9eea kde-l10n-kk-4.6.2.tar.bz2
4f09440092467b9c1fea14e4b26e92e1 kde-l10n-km-4.6.2.tar.bz2
9379522de1857f3b3c067064b536db4d kde-l10n-kn-4.6.2.tar.bz2
aee8f51f1e4ae356b133d1aa226fa32a kde-l10n-ko-4.6.2.tar.bz2
b1ef49c5cfe8a2133626c2064ab1f32b kde-l10n-lt-4.6.2.tar.bz2
3f7fb135a725e47e69e666ad368f09fa kde-l10n-lv-4.6.2.tar.bz2
11530e6568b7eee47629adc210f84517 kde-l10n-mai-4.6.2.tar.bz2
c666d6125f088ed53fe13d063258a5a1 kde-l10n-nb-4.6.2.tar.bz2
4e5cdc89446c9cf51522ad46b21d0ca7 kde-l10n-nds-4.6.2.tar.bz2
d3d1439168d8f68024cb7fcaa383f19e kde-l10n-nl-4.6.2.tar.bz2
6ab2e60938c1dcafe8043af08ddd4a30 kde-l10n-nn-4.6.2.tar.bz2
9fdae265f15d0a1b901fe25f460a0221 kde-l10n-pa-4.6.2.tar.bz2
b648b9b77cfece552ac1116d17eef4fc kde-l10n-pl-4.6.2.tar.bz2
eb666993b9b4f63c7987c9629ff99eb1 kde-l10n-pt-4.6.2.tar.bz2
aeca4af4788f2e7e7521ee8043a80ed6 kde-l10n-pt_BR-4.6.2.tar.bz2
0de87ea137a5ae8a559695ff953cc7be kde-l10n-ro-4.6.2.tar.bz2
a249e1645f3bcbe5c7bcd68c246bdf4f kde-l10n-ru-4.6.2.tar.bz2
7bad8e3d8a6c39621e6d8bcc174d8e53 kde-l10n-sk-4.6.2.tar.bz2
0fb8dca611325b79c73f74c47bcb8265 kde-l10n-sl-4.6.2.tar.bz2
61f88e1877ff3cdc2ae7d375f1fe4bcd kde-l10n-sr-4.6.2.tar.bz2
7a72bc8b320e8d10eb5376f99ce3272c kde-l10n-sv-4.6.2.tar.bz2
d37a6263b87dde08eb7330c33ddd3a95 kde-l10n-th-4.6.2.tar.bz2
77c142098de145940c5bbbada82fc756 kde-l10n-tr-4.6.2.tar.bz2
ff8bddce2f4ad8b57ed281ab78add1c1 kde-l10n-uk-4.6.2.tar.bz2
a800b8e31be14010b690f70add36e02d kde-l10n-wa-4.6.2.tar.bz2
abc84444c120660f364c95698a67f529 kde-l10n-zh_CN-4.6.2.tar.bz2
43e19e6eb0bc0f6bdf345e52e5df87f5 kde-l10n-zh_TW-4.6.2.tar.bz2
7439251b812dc520d4e6ed874036412c kdelibs-4.6.2.tar.bz2
a6e067136af5a18dc69dc4b591eabe10 kdemultimedia-4.6.2.tar.bz2
72952749d055f5323df06a6c2a3d3d8b kdenetwork-4.6.2.tar.bz2
605ed6ca85da2d83605ab500b4b9441a kdepimlibs-4.6.2.tar.bz2
98f6e080bf0cee39856408de9e531205 kdeplasma-addons-4.6.2.tar.bz2
2ff1c0b951ea42295343de0c4ebea965 kdesdk-4.6.2.tar.bz2
c22b64fd89ebb0a0fc53245cf1dad91e kdetoys-4.6.2.tar.bz2
c3eb6cf124355eb79c68ce403dd740ec kdeutils-4.6.2.tar.bz2
97ada60c70a73e511a89f83c2287de79 kdewebdev-4.6.2.tar.bz2
c46e7e51c5dde641f1e4c6bba0f2852f oxygen-icons-4.6.2.tar.bz2
a29356a9322b9ed61ff369bed5a9a26d kdeaccessibility-4.6.3.tar.bz2
8ac0a89337a58ddec49be0ca7a4a7534 kdeadmin-4.6.3.tar.bz2
f45a8ed91c578275056c86f7022695ee kdeartwork-4.6.3.tar.bz2
4f0627e33bd857beebd92be1065ed83e kdebase-4.6.3.tar.bz2
a6f294900d73d92cd68ea93aea297ff0 kdebase-runtime-4.6.3.tar.bz2
1e481727c3a5c2e4b751b9c56bd56583 kdebase-workspace-4.6.3.tar.bz2
085f6497be800adea167addc09b89ccc kdebindings-4.6.3.tar.bz2
d96dd69e7e54c34d9ae18a8db6aee7e3 kdegames-4.6.3.tar.bz2
26c2eca2d707f9fc69db87c0467e5849 kdegraphics-4.6.3.tar.bz2
521eb1cc09cc148466610bbeaea4c490 kde-l10n-ar-4.6.3.tar.bz2
51ba77c47fe5da0b4231c4372301a833 kde-l10n-bg-4.6.3.tar.bz2
5e95ed75bea716d7dc3f0a24aa834e8b kde-l10n-ca-4.6.3.tar.bz2
ce9ae8b33a6bc23d36a510dcc3e2de43 kde-l10n-ca@valencia-4.6.3.tar.bz2
f601f2bfbc855c7c431231b18a5037a6 kde-l10n-cs-4.6.3.tar.bz2
2c2f38e57dcc5fbb7c812dba4050fb54 kde-l10n-da-4.6.3.tar.bz2
2e8a58b6660ccdcf4e7415b374f59e2a kde-l10n-de-4.6.3.tar.bz2
2f450b7ad5d61fa90b7ecac75dece724 kde-l10n-el-4.6.3.tar.bz2
de1e529ab09c43aee344d11f362e43db kde-l10n-en_GB-4.6.3.tar.bz2
fb0537d04fd9985a5048b4cb7551eebe kde-l10n-es-4.6.3.tar.bz2
e0dd4dd166d90740076d5d30211c7d35 kde-l10n-et-4.6.3.tar.bz2
e9b101f00cd29709e37f876baef6d0c3 kde-l10n-eu-4.6.3.tar.bz2
a19c739a851bbe9b6dce2288c37a2d71 kde-l10n-fi-4.6.3.tar.bz2
b46fa84651e0b4a9081f4947170ec60a kde-l10n-fr-4.6.3.tar.bz2
ec76e99b18f8d27ca9b8df959f1605e7 kde-l10n-ga-4.6.3.tar.bz2
9f9cc72cf633ed0c5a9b58ee5a0281ca kde-l10n-gl-4.6.3.tar.bz2
fb532865f497bc133cc91f9b0c98a39a kde-l10n-gu-4.6.3.tar.bz2
da90b73bfa034c097b8a9fc30053f7a8 kde-l10n-he-4.6.3.tar.bz2
ace74a0b07d0070cf28bf8adcec233d6 kde-l10n-hi-4.6.3.tar.bz2
42ec84a3042ae0dae59a326c9d70f029 kde-l10n-hr-4.6.3.tar.bz2
48628b153b1575c017b80e30a61403b1 kde-l10n-hu-4.6.3.tar.bz2
a9980e9d8a4e62b830b8e7691c6a3385 kde-l10n-ia-4.6.3.tar.bz2
2cc1dab0cdc794a409701cfba57879c2 kde-l10n-id-4.6.3.tar.bz2
fefd6bf0989f7d98eeb0e19fc8d40072 kde-l10n-is-4.6.3.tar.bz2
89b4ebf8bc08642cac15b43b9f2db1f0 kde-l10n-it-4.6.3.tar.bz2
2b5c138b4da8485cdbd23840a2c6e1e2 kde-l10n-ja-4.6.3.tar.bz2
2537b2cdfc138ddf55c0988738368a84 kde-l10n-kk-4.6.3.tar.bz2
3dc17c22991b26f8caebba79d9364a73 kde-l10n-km-4.6.3.tar.bz2
1342e8c0bbc969d72fd48e189e16e40c kde-l10n-kn-4.6.3.tar.bz2
2db2dd6cf706f01b97f8fa789a94f6c8 kde-l10n-ko-4.6.3.tar.bz2
d66cb3b9afec95f58126800eb02990b0 kde-l10n-lt-4.6.3.tar.bz2
f973389bcd062bad7d1531c2616779eb kde-l10n-lv-4.6.3.tar.bz2
68b9d2266eebcd167f81ec5b91469e3d kde-l10n-mai-4.6.3.tar.bz2
2e1f1b911c1ada5040febc29a4df6198 kde-l10n-nb-4.6.3.tar.bz2
df0d8d0c68cf8c01ef9b7d096551da49 kde-l10n-nds-4.6.3.tar.bz2
5e202ffaeaf1d6e45180eb873fbbf20f kde-l10n-nl-4.6.3.tar.bz2
57d2d45d23e35c8b5093589f2dbd9e0a kde-l10n-nn-4.6.3.tar.bz2
50c3ce506883642d8efa55a2e9bc1dc1 kde-l10n-pa-4.6.3.tar.bz2
89057e6e4d0846c752aecabc0386e724 kde-l10n-pl-4.6.3.tar.bz2
caf1c54964874123e1593eb0a345e1ca kde-l10n-pt-4.6.3.tar.bz2
fa0df7aeb16c4d454e4c94943c41cbdd kde-l10n-pt_BR-4.6.3.tar.bz2
66907ed3d8d37afac20aae08e4188a48 kde-l10n-ro-4.6.3.tar.bz2
59594340a5f9f6a19ca89341533e92e7 kde-l10n-ru-4.6.3.tar.bz2
86f1a6e190baa2cf4f496c07657fb2fa kde-l10n-sk-4.6.3.tar.bz2
d6ab0ccd8bc6fcf53c2f7ebedfe85f4a kde-l10n-sl-4.6.3.tar.bz2
96c1bb81b1fc3cc0f93cd7556e40654e kde-l10n-sr-4.6.3.tar.bz2
46bdd954e192f96a975947e6b4c88f8a kde-l10n-sv-4.6.3.tar.bz2
32d2d6e033a3f5f438d5a6990e1e3af5 kde-l10n-th-4.6.3.tar.bz2
966f3d53c34cbdb42fd8320bc9b8e555 kde-l10n-tr-4.6.3.tar.bz2
28a503ab78eab59cd19ecabb405db5d7 kde-l10n-uk-4.6.3.tar.bz2
98680c2c096b26edf17de72252893032 kde-l10n-wa-4.6.3.tar.bz2
f89c8830eb5813301e1acfa43acea519 kde-l10n-zh_CN-4.6.3.tar.bz2
81dd406b11ea7e30972269064af47721 kde-l10n-zh_TW-4.6.3.tar.bz2
923a7e8f89aa504647e14472b24b8c0a kdelibs-4.6.3.tar.bz2
fcfef0fe2ee4f216831f74efa78b554b kdemultimedia-4.6.3.tar.bz2
0fd1a35dd3c820d840ca2e11c51b1215 kdenetwork-4.6.3.tar.bz2
0b0fc8d9fea0a6f26e705460a2865e18 kdepimlibs-4.6.3.tar.bz2
c4a223067a228688c6b62a6bdd67a022 kdesdk-4.6.3.tar.bz2
900e1d92cf35ef45eeae9a7796e5fe66 kdetoys-4.6.3.tar.bz2
0d2911c29300d84db10948d7c196aaac kdeutils-4.6.3.tar.bz2
1101f7c38b745ba619be6f9665c87ddc kdewebdev-4.6.3.tar.bz2
3390ae73d1a0c70c121f69b556757fdd oxygen-icons-4.6.3.tar.bz2
259ba3e733fecd145c4389f10bee5ad1 kdeedu-4.6.3.tar.bz2
f3033dc62fcc1988dec6a38796cb929d kdeplasma-addons-4.6.3.tar.bz2

View File

@ -0,0 +1,26 @@
diff --git a/drkonqi/reportassistantpages_bugzilla.cpp b/drkonqi/reportassistantpages_bugzilla.cpp
index b4f8bc2..b282305 100644
--- a/drkonqi/reportassistantpages_bugzilla.cpp
+++ b/drkonqi/reportassistantpages_bugzilla.cpp
@@ -424,6 +424,8 @@ void BugzillaInformationPage::aboutToShow()
ui.m_distroChooserCombo->addItem(i18nc("@label:listbox KDE distribution method",
"Pardus"), "Pardus Packages");
ui.m_distroChooserCombo->addItem(i18nc("@label:listbox KDE distribution method",
+ "Chakra"), "Chakra");
+ ui.m_distroChooserCombo->addItem(i18nc("@label:listbox KDE distribution method",
"Archlinux"), "Archlinux Packages");
ui.m_distroChooserCombo->addItem(i18nc("@label:listbox KDE distribution method",
"FreeBSD (Ports)"), "FreeBSD Ports");
diff --git a/drkonqi/systeminformation.cpp b/drkonqi/systeminformation.cpp
index d43094a..6d86d2c 100644
--- a/drkonqi/systeminformation.cpp
+++ b/drkonqi/systeminformation.cpp
@@ -92,6 +92,8 @@ void SystemInformation::lsbReleaseFinished()
setBugzillaPlatform(QLatin1String("OpenBSD Packages"));
} else if ( m_lsbRelease.contains("solaris",Qt::CaseInsensitive) ) {
setBugzillaPlatform(QLatin1String("Solaris Packages"));
+ } else if ( m_lsbRelease.contains("chakra",Qt::CaseInsensitive) ) {
+ setBugzillaPlatform(QLatin1String("Chakra"));
} else if ( m_lsbRelease.contains("arch",Qt::CaseInsensitive) ) {
setBugzillaPlatform(QLatin1String("Archlinux Packages"));
} else if ( m_lsbRelease.contains("debian",Qt::CaseInsensitive) ) {

View File

@ -43,15 +43,16 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
# 01_knetattach_use_sftp.patch
# 02_oxygenify_knetattach_icon.patch
03_disable_logout_sound.patch
04_disable_nepomuk_popups.patch)
04_disable_nepomuk_popups.patch
05_add_chakra_to_drkonqui.patch)
md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
'68cd8eb57db22c2f2ed554b721253bc2' # branding.svgz
# '45fa12b8baf21c4fc845147afcea2bc1' # 01_knetattach_use_sftp.patch
# '1f0225f31d5f44e753e966fd3a032f00' # 02_oxygenify_knetattach_icon.patch
'a434bf282ee391b2f857184be59a3b6f' # 03_disable_logout_sound.patch
'a3c844d7bbd9a31f39b1b877ae521340') # 04_disable_nepomuk_popups.patch
'a3c844d7bbd9a31f39b1b877ae521340' # 04_disable_nepomuk_popups.patch
'63082e4f07e5840ae7ff3b42c015d72b') # 05_add_chakra_to_drkonqui.patch
#
@ -72,10 +73,9 @@ build()
fi
msg "applying main patchset ..."
#patch -Np1 -i ${srcdir}/01_knetattach_use_sftp.patch || return 1
#patch -Np1 -i ${srcdir}/02_oxygenify_knetattach_icon.patch || return 1
patch -Np1 -i ${srcdir}/03_disable_logout_sound.patch || return 1
patch -Np1 -i ${srcdir}/04_disable_nepomuk_popups.patch || return 1
patch -Np1 -i ${srcdir}/05_add_chakra_to_drkonqui.patch || return 1
# copy our branding stuff
cp -f ${srcdir}/branding.svgz ${srcdir}/${_origname}-${pkgver}/desktoptheme/oxygen/widgets/

View File

@ -26,7 +26,7 @@ pkgname=('kdebase-workspace'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=3
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"
@ -41,8 +41,7 @@ depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever
makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-python>=${_kdever}"
"kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba'
'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl')
# 'google-gadgets-qt>=0.11.2')
'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2')
source=($_mirror/${_origname}-$_kdever.tar.bz2
mishaaq-kcm_touchpad-00370b5.tar.gz
@ -96,7 +95,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
# feature_history-notifications-enable-disable-kde#119207.patch
# feature_kdm-plymouth.patch
shutdown-fix.patch
# shutdown-fix.patch
sensors-fix.patch
)
@ -134,7 +133,7 @@ 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
# 'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch
'ecf3a9d6af9bdd3db0189e06ddf21034' # sensors-fix.patch
)
@ -172,8 +171,8 @@ build()
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
patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch
# patch -Np1 -i ${srcdir}/shutdown-fix.patch
# FIXME: update feature patches
# msg "applying feature patches ..."
@ -183,8 +182,8 @@ build()
# patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch
# patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch
msg "applying upstream patches ..."
patch -Np1 -i ${srcdir}/sensors-fix.patch
# msg "applying upstream patches ..."
# patch -Np1 -i ${srcdir}/sensors-fix.patch
msg "starting workspace build ..."
@ -241,7 +240,7 @@ package_kdebase-workspace()
optdepends=("kdebindings-python : Python Support for Plasma"
"kdeedu-marble : Marble Wallpaper Plugin"
# "google-gadgets-qt : Plasma Support for Google Gadgets"
"google-gadgets-qt : Plasma Support for Google Gadgets"
"qedje : Plasma Support for Edje Files"
"gpsd : Plasma geolocation support"
"(open)ntp : Time/Date sync support")

View File

@ -27,7 +27,7 @@ pkgname=('kdebase'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=4
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"

View File

@ -29,7 +29,7 @@ pkgname=('kdebindings-common'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=2
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"

View File

@ -43,7 +43,7 @@ pkgname=('kdeedu-common'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=1
pkgrel=2
pkgdesc="split package"
url="http://www.kde.org"

View File

@ -30,7 +30,7 @@ pkgname=('kdegraphics-common'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=2
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"
@ -147,7 +147,7 @@ package_kdegraphics-kamera()
make DESTDIR=${pkgdir} install || return 1
done
# Fix duplicated docs in 4.6.2
# Fix duplicated docs in 4.6.3
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

View File

@ -1,9 +0,0 @@
--- src/kdegraphics-4.6.2/kruler/doc/CMakeLists.txt 2011-04-01 21:38:16.000000000 +0200
+++ Desenvolupament/CMakeLists.txt 2011-04-03 02:00:59.073215641 +0200
@@ -1,4 +1,4 @@
########### install files ###############
#
#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kruler)
\ No newline at end of file

View File

@ -1,9 +0,0 @@
--- src/kdegraphics-4.6.2/ksnapshot/doc/CMakeLists.txt 2011-04-01 21:38:15.000000000 +0200
+++ Desenvolupament/CMakeLists.txt 2011-04-03 02:03:59.134359450 +0200
@@ -1,4 +1,4 @@
########### install files ###############
#
#
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ksnapshot)
\ No newline at end of file

View File

@ -39,8 +39,8 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
'qca-ossl' "kdebase-workspace>=${_kdever}"
"kdebase>=${_kdever}" 'libvncserver' 'libmsn'
'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage'
'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5')
'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'ilbc' 'msilbc'
'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer>=2.7.3' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5')
source=($_mirror/${_origname}-$_kdever.tar.bz2 \
'lisa.daemon')
@ -137,7 +137,7 @@ package_kdenetwork-kopete()
{
pkgdesc="Kopete, the instant messenger"
depends=("kdebase-runtime>=${_kdever}" "kdepimlibs>=${_kdever}"
'qca-ossl' 'libotr' 'libmsn' 'libidn' 'qimageblitz' 'libxss' 'libv4l' 'libgadu' 'meanwhile' 'mediastreamer')
'qca-ossl' 'libotr' 'libmsn' 'libidn' 'qimageblitz' 'libxss' 'v4l-utils' 'libgadu' 'meanwhile' 'mediastreamer' 'msilbc')
conflicts=("kdemod-${_origname}-kopete")
groups=("kde" "kde-complete" "${_origname}" "kde-uninstall")
install=${_origname}.install

View File

@ -49,7 +49,7 @@ license=('GPL' 'LGPL' 'FDL')
options=('docs' '!splithdr' 'splitdbg' 'log')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kdebase-runtime>=${_kdever}" 'antlr2'
"kdepimlibs>=${_kdever}" 'subversion' "kdebindings-python>=${_kdever}") # "kdepim-runtime>=${_kdever}"
"kdepimlibs>=${_kdever}" 'subversion' "kdebindings-python>=${_kdever}" "openjdk6") # "kdepim-runtime>=${_kdever}"
source=("$_mirror/${_origname}-$_kdever.tar.bz2"
'fix-antlr2-executable.patch')

View File

@ -35,7 +35,7 @@ pkgname=('koffice-l10n-ca'
'koffice-l10n-zh_cn'
'koffice-l10n-zh_tw')
pkgver=2.3.2
pkgrel=2
pkgrel=3
arch=('any')
url='http://www.koffice.org'
license=('GPL')
@ -364,11 +364,8 @@ package_koffice-l10n-gl() {
}
package_koffice-l10n-hu() {
pkgdesc=('Hungarian Localization for Koffice')
cd $srcdir/build/gl
cd $srcdir/build/hu
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')
@ -402,11 +399,8 @@ package_koffice-l10n-nl() {
}
package_koffice-l10n-pl() {
pkgdesc=('Polish Localization for Koffice')
cd $srcdir/build/gl
cd $srcdir/build/pl
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')

View File

@ -22,7 +22,7 @@ pkgname=('koffice-common'
'koffice-doc')
pkgver=2.3.3
pkgrel=3
pkgrel=4
arch=('i686' 'x86_64')
url='http://koffice.kde.org'
license=('GPL' 'LGPL' 'FDL')

View File

@ -34,13 +34,15 @@ options=('log')
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
# source=($_mirror/${_origname}-$_kdever.tar.bz2
source=("$_mirror/${_origname}-4.6.2.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
md5sums=('c46e7e51c5dde641f1e4c6bba0f2852f'
'da971d7e2c862a6f77fb310a289f5529')
#
@ -48,6 +50,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
#
build()
{
mv -f $srcdir/$_origname-4.6.2 $srcdir/$_origname-$pkgver
cd $srcdir/$_origname-$pkgver
patch -Np0 -i $startdir/install_svg_icons_too.patch || return 1

View File

@ -6,9 +6,9 @@
pkgbase=libcanberra
pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
pkgver=0.26
pkgrel=2
pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification without gtk support"
pkgver=0.28
pkgrel=1
pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
arch=(i686 x86_64)
license=('LGPL')
depends=('libvorbis>=1.3.1' 'libtool' 'alsa-lib>=1.0.23' 'tdb>=1.2.1')
@ -16,13 +16,13 @@ makedepends=('libpulse' 'gstreamer0.10>=0.10.30')
options=(!emptydirs)
url=http://0pointer.de/lennart/projects/libcanberra
source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
md5sums=('ee2c66ada7c851a4e7b6eb1682285a24')
md5sums=('c198b4811598c4c161ff505e4531b02c')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
--disable-static --with-builtin=dso --enable-null --disable-oss \
--enable-alsa --enable-gstreamer --enable-pulse --disable-gtk
--enable-alsa --enable-gstreamer --enable-pulse --disable-gtk
make
}
@ -63,4 +63,4 @@ package_libcanberra-gstreamer() {
mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
}
}

View File

@ -5,9 +5,9 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=libktorrent
pkgver=1.1.0
pkgver=1.1.1
pkgrel=1
ktorver=4.1.0
ktorver=4.1.1
pkgdesc="A BitTorrent program for KDE"
arch=('i686' 'x86_64')
url="http://ktorrent.org"
@ -16,7 +16,7 @@ depends=('kdelibs')
makedepends=('autoconf' 'perl' 'automoc4' 'cmake' 'kdepimlibs' 'kdebase-workspace')
source=(http://ktorrent.org/downloads/${ktorver}/libktorrent-${pkgver}.tar.bz2)
options=('libtool')
md5sums=('76d3e58bbf2e4df7e97421e06ebf8fb8')
md5sums=('96de8dd6d6cea4255ce946bb4cd69836')
build() {
cd ${srcdir}

View File

@ -4,34 +4,23 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# original name (used for the source and pkgnames)
_origname=mediastreamer
pkgname=${_origname}
pkgver=2.3.0
pkgname=mediastreamer
pkgver=2.7.3
pkgrel=2
pkgdesc='A powerful and lightweighted streaming engine specialized for voice/video telephony applications'
pkgdesc="A library written in C that allows you to create and run audio and video streams."
arch=('i686' 'x86_64')
url="http://www.linphone.org/index.php/eng/code_review/mediastreamer2"
url="http://www.linphone.org"
license=('GPL')
depends=('ortp>=0.15.0' 'sdl>=1.2.14' 'libv4l>=0.6.3' 'speex' 'libtheora>=1.1.1' "ffmpeg>=0.5")
makedepends=()
groups=("kde-uninstall" "kde-support")
options=('!splitdbg' '!splithdr')
provides=("${_origname}=$pkgver")
conflicts=("${_origname}")
source=(http://mirror.cinquix.com/pub/savannah/linphone/mediastreamer/${_origname}-$pkgver.tar.gz)
md5sums=('867d539cf11e942dcbfd08d4b3182397') # mediastreamer-2.3.0.tar.gz
depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg' 'libxv')
makedepends=('cmake' 'automoc4')
source=("http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-$pkgver.tar.gz")
md5sums=('5213307f557d86aa648f1a53a885138c')
build() {
cd "$srcdir"/${_origname}-$pkgver
./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="$pkgdir" install || return 1
cd "$srcdir"/$pkgname-$pkgver/
./configure --prefix=/usr
make
make DESTDIR=${pkgdir} install
}

View File

@ -3,7 +3,8 @@
# Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626
pkgname=appset-qt
pkgver=0.4.4
pkgver=0.4.99
_pkgver=0.5.0pre
pkgrel=2
pkgdesc="An advanced and feature rich Package Manager Frontend"
arch=('i686' 'x86_64')
@ -12,40 +13,42 @@ license=('GPL2')
depends=('qt>=4.7')
optdepends=('ccr: For Community Repository support')
install=${pkgname}.install
source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz
source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz
http://sourceforge.net/projects/appset/files/appset-qt/0.5/0.5.0/$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.4.4-chakra.patch
http://chakra-project.org/sources/$pkgname/$pkgname-0.4.99-chakra.patch
http://chakra-project.org/sources/$pkgname/add-chinese-taiwan.patch
#http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz
http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz
http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.5.0.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz
http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.4.4.tar.gz
http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.5.0.tar.gz
)
md5sums=(ed10d700994a6c38d8eafcf442d90360
md5sums=(fe36bcbe31602fab843e7b0676c5196e
87f5f278e3fe67ed2cd6165c2835d81b
1bc3d8e5ea4301ad60011075eaf786f4
f193b069c8ac4d392d0d1b6c9ca3469f
7de9e3d87fb4258174af214b291b5444 # add-chinese-taiwan.patch
#8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz
#275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz
6a0f0a7af86b518853533d046cdba069 # appset-qt_de-0.5.0.tar.gz
#b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz
#033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz
#676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz
fa69077be4ac7c409df87ab256c97919 # appset-qt_fr.0.5.0.tar.gz
#2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz
#53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz
03faf18f8994cd406607d5ab6b0f2f16 # appset-qt_zh-tw-0.4.4.tar.gz
f75199ceb618cb580efcd57b89301f6b # appset-qt_zh-tw-0.5.0.tar.gz
)
build() {
cd $srcdir/$pkgname-$pkgver-sources
#cd $srcdir/$pkgname-$pkgver-sources
cd $srcdir/$pkgname-$_pkgver-sources
# copy oxygen icons
cp -v ../*png Qt/AppSet-Qt
# patch it for Chakra GNU/Linux
patch -Np1 -i ${startdir}/src/$pkgname-0.4.4-chakra.patch
patch -Np1 -i ${startdir}/src/$pkgname-0.4.99-chakra.patch
# add chakra translations (check upstream)
patch -Np1 -i ${startdir}/src/add-chinese-taiwan.patch
@ -54,9 +57,9 @@ build() {
# check for updated strings
cd Qt/AppSet-Qt
lupdate *.cpp *.ui *.h -ts appset*-qt_*.ts
lupdate *.cpp *.ui *.h -ts *.ts
cd ../AppSetTray-Qt
lupdate *.cpp *.h -ts appsettay*-qt_*.ts
lupdate *.cpp *.h -ts *.ts
cd ../..
qmake PREFIX=/usr -Wnone
@ -69,12 +72,14 @@ build() {
}
package() {
cd $srcdir/$pkgname-$pkgver-sources
#cd $srcdir/$pkgname-$pkgver-sources
cd $srcdir/$pkgname-$_pkgver-sources
make INSTALL_ROOT="$pkgdir/" install
#helper daemon
install -m 755 -d "$pkgdir/etc/rc.d" || return 1
install -m 755 "$srcdir/$pkgname-$pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
#install -m 755 "$srcdir/$pkgname-$pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
install -m 755 "$srcdir/$pkgname-$_pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
}

View File

@ -27,3 +27,5 @@ post_upgrade(){
post_remove(){
sed -i '/^DAEMONS/{s/ appset-helper)$/)/}' /etc/rc.conf
}

View File

@ -8,9 +8,9 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=bluedevil
pkgver=1.0.2
pkgrel=1
pkgdesc='The new bluetooth stack for KDE, its composed of: KCM, KDED, KIO, Library and some other small applications'
pkgver=1.1
pkgrel=2
pkgdesc='The new bluetooth stack for KDE, it is composed of: KCM, KDED, KIO, Library and some other small applications'
arch=('i686' 'x86_64')
url="http://gitorious.org/bluedevil"
license=('GPL')
@ -20,7 +20,7 @@ provides=(bluedevil)
conflicts=(bluedevil-git)
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
md5sums=("c0c814146098b865144957bc8b3bd7e7")
md5sums=('240151ff99b81f630de51fa9f8230198')
build(){
cd ${srcdir}

View File

@ -6,7 +6,7 @@
pkgname=cbundle
pkgver=0.4.5.1
pkgrel=1
pkgrel=2
depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse')
makedepends=('qt' 'automoc4' 'kdebase-workspace')
pkgdesc="A shared library for using Chakra software bundles"
@ -15,7 +15,7 @@ license=('GPL')
url="http://chakra-project.org/"
source=("http://chakra-project.org/sources/cinstall/cbundle-$pkgver.tar.xz")
md5sums=('70ba09e13b952d8199ad373735088792')
md5sums=('d4ff21cbf6293edd9f134889768d1bbc')
# create tarball: source PKGBUILD && mksource
@ -29,7 +29,6 @@ mksource() {
build() {
cd "${srcdir}/cbundle"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \

View File

@ -7,7 +7,7 @@
pkgname=cinstall
pkgver=0.4.5.1
pkgrel=1
pkgrel=2
depends=('rsync' 'cbundle')
makedepends=('kdelibs' 'qt' 'automoc4')
pkgdesc="Bundle Creator/Launcher and Package-Manager"
@ -17,7 +17,7 @@ install=$pkgname.install
url="http://chakra-project.org/"
source=("http://chakra-project.org/sources/cinstall/cinstall-$pkgver.tar.xz")
md5sums=('05dc73ea2a2fca80cc55729295053e8b')
md5sums=('c7c22a279dc3f0f9e16ada74e5ebaf41')
# create tarball: source PKGBUILD && mksource

View File

@ -5,7 +5,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=libbluedevil
pkgver=1.8
pkgver=1.9
pkgrel=1
pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack'
arch=('i686' 'x86_64')
@ -13,14 +13,15 @@ url="https://projects.kde.org/projects/playground/libs/libbluedevil"
license=('GPL')
depends=('qt' 'bluez')
makedepends=('cmake')
source=("http://media.ereslibre.es/2010/11/${pkgname}-v${pkgver}-1.tar.bz2")
md5sums=('03c79dd8a6d40e2872fee27c9b81190d')
# source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
source=("ftp://ftp.belnet.be/packages/kde/unstable/libbluedevil/1.9/src/libbluedevil-1.9.tar.bz2")
md5sums=('5f22614dfb840734da6e8b8710c2472e')
build(){
cd ${srcdir}
mkdir build
cd build
cmake ../${pkgname}-v${pkgver}-1 \
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
@ -29,4 +30,4 @@ build(){
package() {
cd ${srcdir}/build
make DESTDIR=${pkgdir} install
}
}

View File

@ -8,25 +8,25 @@
# package info
#
pkgname=tribe
pkgver=2011.04
pkgver=2011.04_r0
pkgrel=1
_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.2' 'squashfs-tools' 'partitionmanager>=1216949-4'
depends=('kdelibs' 'kdeedu-marble>=4.6.3' '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' 'libsm')
makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.3' '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_201104.html")
"http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104R0.html")
md5sums=('95c5d6a0a116ce08993b95089560a099'
'fe5f83408d9cd84d27d672a5937add65')
md5sums=('28f4c2ee7f5a103bb9ab642aa1db87d4'
'fb75ac0ce37b6ad838f667b415f5a2e0')
groups=('kde-uninstall')
install=tools-tribe.install
@ -85,7 +85,7 @@ package()
cd "${srcdir}/$pkgname"
msg "Make successful, installing..."
make DESTDIR=$startdir/pkg install || return 1
cp -vf ${srcdir}/RELEASE_NOTES_201104.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
cp -vf ${srcdir}/RELEASE_NOTES_201104R0.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
# remove nasty files
find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +