Simplify the pkgbuild

This commit is contained in:
Manuel 2011-12-10 00:48:05 +00:00
parent fa05fffbce
commit 9ed11fb93e
3 changed files with 172 additions and 221 deletions

View File

@ -10,6 +10,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgbase=calligra-l10n
pkgname=('calligra-l10n-ca'
'calligra-l10n-ca@valencia'
'calligra-l10n-cs'
'calligra-l10n-da'
'calligra-l10n-de'
'calligra-l10n-el'
@ -32,7 +33,7 @@ pkgname=('calligra-l10n-ca'
'calligra-l10n-sv'
# 'calligra-l10n-tr'
'calligra-l10n-uk'
# 'calligra-l10n-zh_cn'
'calligra-l10n-zh_CN'
'calligra-l10n-zh_TW')
pkgver=2.3.85
pkgrel=1
@ -62,7 +63,8 @@ source=(ftp://ftp.kde.org/pub/kde/unstable/calligra-${pkgver}/calligra-l10n/call
ftp://ftp.kde.org/pub/kde/unstable/calligra-${pkgver}/calligra-l10n/calligra-l10n-ru-${pkgver}.tar.bz2
ftp://ftp.kde.org/pub/kde/unstable/calligra-${pkgver}/calligra-l10n/calligra-l10n-sv-${pkgver}.tar.bz2
ftp://ftp.kde.org/pub/kde/unstable/calligra-${pkgver}/calligra-l10n/calligra-l10n-uk-${pkgver}.tar.bz2
ftp://ftp.kde.org/pub/kde/unstable/calligra-${pkgver}/calligra-l10n/calligra-l10n-zh_TW-${pkgver}.tar.bz2)
ftp://ftp.kde.org/pub/kde/unstable/calligra-${pkgver}/calligra-l10n/calligra-l10n-zh_TW-${pkgver}.tar.bz2
ftp://ftp.kde.org/pub/kde/unstable/calligra-${pkgver}/calligra-l10n/calligra-l10n-zh_CN-${pkgver}.tar.bz2)
md5sums=('8ca2790b2d7fbf6546099aeda13e6786'
'58b1a7ac73d51f1fc8a88d034d0e9f4f'
'76a46c54710a098d23cb1a0aa831b47c'
@ -84,219 +86,21 @@ md5sums=('8ca2790b2d7fbf6546099aeda13e6786'
'9fd0f88ed7fdf3928513b4ae3124c74c'
'43769939a24d4e5df45d91409f2b6111'
'ed7611b9d958f1c62fb5aa4b6e95577a'
'76927f3889ee7f643ac708b7de5fbeec')
'76927f3889ee7f643ac708b7de5fbeec'
'61d5bdb6f7bc2ee691da95bdf86d0a5c')
build() {
cd $srcdir
install -d build/ca
cd build/ca
cmake ${srcdir}/calligra-l10n-ca-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/ca@valencia
cd build/ca@valencia
cmake ${srcdir}/calligra-l10n-ca@valencia-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/da
cd build/da
cmake ${srcdir}/calligra-l10n-da-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/de
cd build/de
cmake ${srcdir}/calligra-l10n-de-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/el
cd build/el
cmake ${srcdir}/calligra-l10n-el-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/en_GB
cd build/en_GB
cmake ${srcdir}/calligra-l10n-en_GB-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/es
cd build/es
cmake ${srcdir}/calligra-l10n-es-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/et
cd build/et
cmake ${srcdir}/calligra-l10n-et-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/fr
cd build/fr
cmake ${srcdir}/calligra-l10n-fr-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
# install -d build/gl
# cd build/gl
# cmake ${srcdir}/calligra-l10n-gl-${pkgver} \
# -DCMAKE_BUILD_TYPE=Release \
# -DCMAKE_INSTALL_PREFIX=/usr
# make
# cd ../..
# install -d build/hu
# cd build/hu
# cmake ${srcdir}/calligra-l10n-hu-${pkgver} \
# -DCMAKE_BUILD_TYPE=Release \
# -DCMAKE_INSTALL_PREFIX=/usr
# make
# cd ../..
install -d build/it
cd build/it
cmake ${srcdir}/calligra-l10n-it-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
# install -d build/ja
# cd build/ja
# cmake ${srcdir}/calligra-l10n-ja-${pkgver} \
# -DCMAKE_BUILD_TYPE=Release \
# -DCMAKE_INSTALL_PREFIX=/usr
# make
# cd ../..
install -d build/kk
cd build/kk
cmake ${srcdir}/calligra-l10n-kk-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/nb
cd build/nb
cmake ${srcdir}/calligra-l10n-nb-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/nds
cd build/nds
cmake ${srcdir}/calligra-l10n-nds-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/nl
cd build/nl
cmake ${srcdir}/calligra-l10n-nl-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/pl
cd build/pl
cmake ${srcdir}/calligra-l10n-pl-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/pt
cd build/pt
cmake ${srcdir}/calligra-l10n-pt-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/pt_BR
cd build/pt_BR
cmake ${srcdir}/calligra-l10n-pt_BR-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/ru
cd build/ru
cmake ${srcdir}/calligra-l10n-ru-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
install -d build/sv
cd build/sv
cmake ${srcdir}/calligra-l10n-sv-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
# install -d build/tr
# cd build/tr
# cmake ${srcdir}/calligra-l10n-tr-${pkgver} \
# -DCMAKE_BUILD_TYPE=Release \
# -DCMAKE_INSTALL_PREFIX=/usr
# make
# cd ../..
install -d build/uk
cd build/uk
cmake ${srcdir}/calligra-l10n-uk-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
# install -d build/zh_CN
# cd build/zh_CN
# cmake ${srcdir}/calligra-l10n-zh_CN-${pkgver} \
# -DCMAKE_BUILD_TYPE=Release \
# -DCMAKE_INSTALL_PREFIX=/usr
# make
# cd ../..
install -d build/zh_TW
cd build/zh_TW
cmake ${srcdir}/calligra-l10n-zh_TW-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../..
langs="ca ca@valencia cs da de el en_GB es et fr it kk nb nds nl pl pt pt_BR ru sv uk zh_CN zh_TW"
for lang in $langs; do
install -d build/${lang}
pushd build/${lang}
cmake ${srcdir}/calligra-l10n-${lang}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
popd
done
}
package_calligra-l10n-ca() {
@ -311,6 +115,12 @@ package_calligra-l10n-ca@valencia() {
make DESTDIR=$pkgdir install
}
package_calligra-l10n-cs() {
pkgdesc=('Czech Localization for calligra')
cd $srcdir/build/cs
make DESTDIR=$pkgdir install
}
package_calligra-l10n-da() {
pkgdesc=('Danish Localization for calligra')
cd $srcdir/build/da
@ -421,11 +231,11 @@ package_calligra-l10n-uk() {
cd $srcdir/build/uk
make DESTDIR=$pkgdir install
}
#package_calligra-l10n-zh_cn() {
# pkgdesc=('Simplified Chinese Localization for calligra')
# cd $srcdir/build/zh_CN
# make DESTDIR=$pkgdir install
#}
package_calligra-l10n-zh_CN() {
pkgdesc=('Simplified Chinese Localization for calligra')
cd $srcdir/build/zh_CN
make DESTDIR=$pkgdir install
}
package_calligra-l10n-zh_TW() {
pkgdesc=('Traditional Chinese Localization for calligra')
cd $srcdir/build/zh_TW

View File

@ -16,7 +16,7 @@ pkgname=('kde-workspace'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=2
pkgrel=3
pkgdesc="split package"
url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL')
@ -67,7 +67,7 @@ source=($_mirror/${pkgbase}-$_kdever.tar.bz2
# shutdown-fix.patch
sensors-fix.patch
# Add support for Burg
feature_burg-support.diff)
feature_burg-reboot.diff)
md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
`grep kde-wallpapers-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` # kde-wallpapers
@ -93,7 +93,7 @@ md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
'97a5eb51e6f9d460f0d61bb322a1db5e' # fix_kdm_configdef.patch
'5f963f80a026f0600edae1b1c70411e5' # fix_root-only-kcms.patch
'ecf3a9d6af9bdd3db0189e06ddf21034' # sensors-fix.patch
'07e698271d959c4966f3df34ec569398') # feature_burg-support.diff
'd629a642f45482c208ac1dbfba12ba1c') # feature_burg-reboot.diff
# '13c3203589143e9e2fc757c17375227a' # feature_plasma-transparent-panel-v4-rb#472.patch
@ -123,7 +123,7 @@ build()
patch -Np0 -i ${srcdir}/fix_terminate-server.patch
patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch
patch -p1 -i ${srcdir}/feature_burg-support.diff
patch -p1 -i ${srcdir}/feature_burg-reboot.diff
# FIXME: update feature patches

View File

@ -0,0 +1,141 @@
diff -Nurd kde-workspace-4.7.90/kdm/backend/bootman.c mywork/kdm/backend/bootman.c
--- kde-workspace-4.7.90/kdm/backend/bootman.c 2011-07-27 20:35:39.000000000 +0200
+++ mywork/kdm/backend/bootman.c 2011-12-04 20:36:43.045270353 +0100
@@ -41,6 +41,7 @@
#include <unistd.h>
#include <stdio.h>
#include <ctype.h>
+#include <malloc.h>
static int
getNull(char ***opts ATTR_UNUSED, int *def ATTR_UNUSED, int *cur ATTR_UNUSED)
@@ -160,26 +161,29 @@
}
}
-#define GRUB2_MENU "/boot/grub/grub.cfg"
static char *grubReboot;
+static char *grubConfig;
+static char *grubRebootExec;
+
+
static int
-getGrub2(char ***opts, int *def, int *cur)
+getGrub2OrBurg(char ***opts, int *def, int *cur)
{
FILE *f;
char *ptr, *linp;
int len, ret = BO_NOMAN, i;
char line[1000];
- if (!grubReboot && !(grubReboot = locate("grub-reboot")))
+ if (!grubReboot && !(grubReboot = locate(grubRebootExec)))
return BO_NOMAN;
*def = -1;
*cur = -1;
*opts = initStrArr(0);
- if (!(f = fopen(GRUB2_MENU, "r")))
+ if (!(f = fopen(grubConfig, "r")))
return errno == ENOENT ? BO_NOMAN : BO_IO;
while ((len = fGets(line, sizeof(line), f)) != -1) {
for (linp = line; isspace(*linp); linp++, len--);
@@ -222,6 +226,17 @@
return ret;
}
+static int
+getGrub2(char ***opts, int *def, int *cur){
+ if(!grubConfig && !grubRebootExec){
+ grubConfig=malloc(21*sizeof(char));
+ strcpy(grubConfig,"/boot/grub/grub.cfg");
+ grubRebootExec=malloc(13*sizeof(char));
+ strcpy(grubRebootExec,"grub-reboot");
+ }
+ return getGrub2OrBurg(opts,def,cur);
+}
+
static int
setGrub2(const char *opt, SdRec *sdr)
{
@@ -233,7 +248,7 @@
for (i = 0; opts[i]; i++) {
if (!strcmp(opts[i], opt)) {
sdr->osindex = i;
- sdr->bmstamp = mTime(GRUB2_MENU);
+ sdr->bmstamp = mTime(grubConfig);
freeStrArr(opts);
return BO_OK;
}
@@ -245,7 +260,7 @@
static void
commitGrub2(void)
{
- if (sdRec.bmstamp != mTime(GRUB2_MENU) &&
+ if (sdRec.bmstamp != mTime(grubConfig) &&
setGrub2(sdRec.osname, &sdRec) != BO_OK)
return;
@@ -257,6 +272,29 @@
}
}
+static int
+getBurg(char ***opts, int *def, int *cur){
+ if(!grubConfig && !grubRebootExec){
+ grubConfig=malloc(21*sizeof(char));
+ strcpy(grubConfig,"/boot/burg/burg.cfg");
+ grubRebootExec=malloc(13*sizeof(char));
+ strcpy(grubRebootExec,"burg-reboot");
+ }
+ return getGrub2OrBurg(opts,def,cur);
+}
+
+static int
+setBurg(const char *opt, SdRec *sdr)
+{
+ return setGrub2(opt,sdr);
+}
+
+static void
+commitBurg(void)
+{
+ commitGrub2();
+}
+
static char *lilo;
static int
@@ -352,6 +390,7 @@
{ getNull, setNull, 0 },
{ getGrub, setGrub, commitGrub },
{ getGrub2, setGrub2, commitGrub2 },
+ { getBurg, setBurg, commitBurg },
{ getLilo, setLilo, commitLilo },
};
diff -Nurd kde-workspace-4.7.90/kdm/config.def mywork/kdm/config.def
--- kde-workspace-4.7.90/kdm/config.def 2011-07-27 20:35:39.000000000 +0200
+++ mywork/kdm/config.def 2011-12-04 20:37:40.122520573 +0100
@@ -1257,6 +1257,7 @@
None/BO_NONE: no boot manager
Grub/BO_GRUB: Grub boot manager
Grub2/BO_GRUB2: Grub2 boot manager
+ Burg/BO_BURG: Burg boot manager
Lilo/BO_LILO: Lilo boot manager (Linux on i386 &amp; x86-64 only)
Default: None
User: core
diff -Nurd kde-workspace-4.7.90/kdm/kcm/kdm-shut.cpp mywork/kdm/kcm/kdm-shut.cpp
--- kde-workspace-4.7.90/kdm/kcm/kdm-shut.cpp 2011-08-22 15:29:50.000000000 +0200
+++ mywork/kdm/kcm/kdm-shut.cpp 2011-12-04 20:38:22.932961382 +0100
@@ -98,6 +98,7 @@
bm_combo->insertItem("None", i18nc("boot manager", "None"));
bm_combo->insertItem("Grub", i18n("Grub"));
bm_combo->insertItem("Grub2", i18n("Grub2"));
+ bm_combo->insertItem("Burg", i18n("Burg"));
#if defined(__linux__) && (defined(__i386__) || defined(__amd64__))
bm_combo->insertItem("Lilo", i18n("Lilo"));
#endif