* add kdelibs

* fix kde-common
This commit is contained in:
Phil Miller 2010-05-21 00:31:10 +00:00
parent 67af2a3d6d
commit caac6c1565
9 changed files with 351 additions and 2 deletions

View File

@ -119,7 +119,7 @@ build()
install -D -m644 -o root -g root ${srcdir}/Chakra-backup.desktop ${pkgdir}/usr/share/applications/kde4/Chakra-backup.desktop
# install config file for updates
install -D -m755 -o root -g root ${srcdir}/updates.conf ${pkgdir}/etc/kdemod/updates.conf
install -D -m755 -o root -g root ${srcdir}/updates.conf ${pkgdir}/etc/chakra/updates.conf
# install root actions service menu
cd ${srcdir}/rootactions_servicemenu_2.4.10/Root_Actions_2.4.10/dolphin-KDE4/

View File

@ -8,7 +8,7 @@ post_install() {
echo " "
echo " Installation Prefix : /usr"
echo " Configuration dir : ~/.kde4"
echo " Update configs : /etc/kde/updates.conf"
echo " Update configs : /etc/chakra/updates.conf"
echo " KDEmod Patches : /usr/share/kde/patches"
echo " "
echo " WWW : http://chakra-project.org"

View File

@ -0,0 +1,24 @@
diff -Naur kdelibs-4.3.85.orig/kdeui/dialogs/kaboutapplicationdialog.cpp kdelibs-4.3.85/kdeui/dialogs/kaboutapplicationdialog.cpp
--- kdelibs-4.3.85.orig/kdeui/dialogs/kaboutapplicationdialog.cpp 2009-12-02 22:28:47.000000000 +0100
+++ kdelibs-4.3.85/kdeui/dialogs/kaboutapplicationdialog.cpp 2009-12-19 16:26:05.000000000 +0100
@@ -108,7 +108,7 @@
aboutData->programName(), aboutData->version()));
else
titleWidget->setText(i18nc("Program name, version and KDE platform version; do not translate 'Development Platform'",
- "<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE Development Platform %3</html>",
+ "<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE Development Platform %3 optimized by the Chakra-Project</html>",
aboutData->programName(), aboutData->version(), QString(KDE_VERSION_STRING)));
QTabWidget *tabWidget = new QTabWidget;
diff -Naur kdelibs-4.3.85.orig/kdeui/dialogs/kaboutkdedialog_p.cpp kdelibs-4.3.85/kdeui/dialogs/kaboutkdedialog_p.cpp
--- kdelibs-4.3.85.orig/kdeui/dialogs/kaboutkdedialog_p.cpp 2009-11-12 22:50:55.000000000 +0100
+++ kdelibs-4.3.85/kdeui/dialogs/kaboutkdedialog_p.cpp 2009-12-19 16:27:11.000000000 +0100
@@ -43,7 +43,7 @@
setButtons(KDialog::Close);
KTitleWidget *titleWidget = new KTitleWidget(this);
- titleWidget->setText(i18n("<html><font size=\"5\">KDE - Be Free!</font><br /><b>Platform Version %1</b></html>",
+ titleWidget->setText(i18n("<html><font size=\"5\">KDE - Be Free!</font><br /><b>Platform Version %1 optimized by the Chakra-Project</b></html>",
QString(KDE_VERSION_STRING)));
titleWidget->setPixmap(KIcon("kde").pixmap(48), KTitleWidget::ImageLeft);

View File

@ -0,0 +1,26 @@
Index: b/kded/kbuildsycoca.cpp
===================================================================
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -307,7 +307,7 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
entry->setLayoutInfo(kdeMenu->layoutList);
Index: b/kded/CMakeLists.txt
===================================================================
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -69,7 +69,7 @@
if (WIN32)
install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
else (WIN32)
-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
endif (WIN32)
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )

View File

@ -0,0 +1,17 @@
diff -Naur kdelibs-4.3.98.orig/kded/applications.menu kdelibs-4.3.98/kded/applications.menu
--- kdelibs-4.3.98.orig/kded/applications.menu 2010-01-31 20:28:11.000000000 +0100
+++ kdelibs-4.3.98/kded/applications.menu 2010-02-01 14:30:58.000000000 +0100
@@ -373,6 +373,13 @@
</Include>
</Menu>
<Menu>
+ <Name>Chakra</Name>
+ <Directory>Chakra.directory</Directory>
+ <Include>
+ <Category>Chakra</Category>
+ </Include>
+ </Menu>
+ <Menu>
<Name>System</Name>
<Directory>kde-system.directory</Directory>
<Include>

View File

@ -0,0 +1,12 @@
diff -Naur kdelibs-4.2.0.orig/kate/syntax/data/bash.xml kdelibs-4.2.0/kate/syntax/data/bash.xml
--- kdelibs-4.2.0.orig/kate/syntax/data/bash.xml 2009-01-04 23:41:30.000000000 +0100
+++ kdelibs-4.2.0/kate/syntax/data/bash.xml 2009-01-28 01:41:55.000000000 +0100
@@ -8,7 +8,7 @@
<!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following -->
<!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )"> <!-- valid character in a file name -->
]>
-<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;PKGBUILD.*;PKGBUILD*.proto;*script.proto;prot*.install;ChangeLog.proto;SPLITBUILD;SPLITBUILD.*;*.install" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)

View File

@ -0,0 +1,11 @@
--- kio/kio/kprotocolmanager.cpp.orig 2008-08-20 21:54:05.000000000 +0200
+++ kio/kio/kprotocolmanager.cpp 2009-02-22 21:46:14.736186150 +0100
@@ -77,7 +77,7 @@
// DEFAULT USERAGENT STRING
#define CFG_DEFAULT_UAGENT(X) \
-QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \
+QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko) Chakra/1.0") \
.arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
#define PRIVATE_DATA \

161
kdelibs/PKGBUILD Normal file
View File

@ -0,0 +1,161 @@
#
# KDE SC Packages for Chakra, part of chakra-project.org
#
# 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=kdelibs
#
# package info
#
pkgbase=('kdelibs')
pkgname=('kdelibs'
'kdelibs-doc')
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=1
pkgdesc="split package"
url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL')
options=('docs' '!splithdr')
makedepends=("${_qtpkg}>=${_qtver}"
"kde-common>=${_kdever}"
"oxygen-icons>=${_kdever}"
'pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'hspell' 'libxslt'
'shared-mime-info' 'hal' 'xz-utils' 'enchant' 'jasper' 'openexr' 'giflib'
'strigi' 'libxtst' 'soprano' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt'
'libxss' 'phonon' 'shared-desktop-ontologies' 'attica' 'heimdal' 'libxcursor'
'hicolor-icon-theme')
replaces=('arts' "kdelibs-experimental")
source=($_mirror/${_origname}-$_kdever.tar.bz2
01_chakra_tag.patch
02_kde_applications_menu.patch
03_chakra_menu.patch
04_add_arch_filetypes_to_kate_syntax_highlighting.patch
05_useragent-branding.patch)
md5sums=('bd2122af41660bfff642bd077ef798a2' # kdelibs-4.4.3.tar.bz2
'40ba51f0c50ced94dfffe667ec856950' # 01_kdemod_tag.patch
'e94450ba5430ea9c1e33bad9ae38ca2d' # 02_kde_applications_menu.patch
'53b85403e4dd8f9146933c52ca23243e' # 03_chakra_menu.patch
'b125c42a85f1b265b7aa31fb7950b690' # 04_add_arch_filetypes_to_kate_syntax_highlighting.patch
'116715c07effa490e24f946693b3ecf7') # 05_useragent-branding.patch
#
# build function
#
build()
{
cd ${srcdir}/${_origname}-${pkgver}
# main patches
msg "applying main patchset ..."
patch -Np1 -i ${srcdir}/01_chakra_tag.patch || return 1
patch -Np1 -i ${srcdir}/02_kde_applications_menu.patch || return 1
patch -Np1 -i ${srcdir}/03_chakra_menu.patch || return 1
patch -Np1 -i ${srcdir}/04_add_arch_filetypes_to_kate_syntax_highlighting.patch || return 1
patch -Np0 -i ${srcdir}/05_useragent-branding.patch || return 1
# fixes
# msg "applying fixes ..."
cd ..
msg "starting build ..."
mkdir -p build
cd build
cmake ../${_origname}-${pkgver} \
-DCMAKE_BUILD_TYPE=${_build_type} \
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
-DSYSCONF_INSTALL_DIR=/etc \
-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-DKDE_DISTRIBUTION_TEXT='Chakra' \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
-DKAUTH_BACKEND=PolkitQt-1 \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
make VERBOSE=1 || return 1
}
package_kdelibs()
{
pkgdesc="KDE Core Libraries"
depends=("${_qtpkg}>=${_qtver}" "kde-common>=${_kdever}" "oxygen-icons>=${_kdever}"
'shared-mime-info' 'hal' 'xz-utils' 'enchant' 'jasper' 'openexr' 'giflib'
'strigi' 'libxtst' 'soprano' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt'
'libxss' 'phonon' 'shared-desktop-ontologies' 'attica' 'heimdal' 'libxcursor'
'hicolor-icon-theme')
optdepends=('phonon-xine : Xine Phonon backend (default)'
'phonon-gstreamer : GStreamer Phonon backend'
'phonon-mplayer : MPlayer Phonon backend'
'phonon-vlc : VLC Phonon backend'
'avahi : Service discovery on your local network'
'aspell : Spell checking'
'hspell : Hebrew spell checking')
provides=("${_origname}=${_kdever}")
conflicts=("${_origname}" "kde-meta-${_origname}")
replaces=('kdelibs-devel' 'kdelibs-experimental')
groups=("kde" "kde-minimal" "kde-complete" "kde-uninstall")
install=${_origname}.install
cd ${srcdir}/build
make DESTDIR=${pkgdir} install || return 1
# link cert bundle to the one from ca-certificates
rm -f ${pkgdir}/usr/share/apps/kssl/ca-bundle.crt
ln -sf /etc/ssl/certs/ca-certificates.crt ${pkgdir}/usr/share/apps/kssl/ca-bundle.crt
# put docu into separate package
mv ${pkgdir}/usr/share/doc ${srcdir}/
mv ${pkgdir}/usr/share/man ${srcdir}/
# include our patches into the package
ls -1 ${startdir}/*.patch &>/dev/null 2>&1
if [ "$?" = "0" ]; then
warning "incuding patches into package"
rm -rf ${startdir}/*experimental*.patch
mkdir -p ${pkgdir}/usr/share/kdemod/patches/${_origname} &>/dev/null
for i in ${startdir}/*.patch; do
msg "$i"
cp $i ${pkgdir}/usr/share/kdemod/patches/${_origname}/ &>/dev/null
done
else
warning "no patches found, skipping to include them into the package..."
fi
}
package_kdelibs-doc()
{
pkgdesc="KDE Core Libraries - Documentation"
depends=("${_origname}>=${_kdever}")
groups=("kde-complete" "kde-doc" "kde-uninstall")
mkdir -p ${pkgdir}/usr/share
mv ${srcdir}/doc ${pkgdir}/usr/share
mv ${srcdir}/man ${pkgdir}/usr/share
}

98
kdelibs/kdelibs.install Normal file
View File

@ -0,0 +1,98 @@
post_install() {
echo " "
echo " > ATTENTION:"
echo " Install aspell and the appropriate language package"
echo " to enable spell-checking in KDE ..."
echo " "
echo " If you experience problems with missing icons or menu"
echo " entries, run the following commands and restart KDE:"
echo " sudo chakra-config-updater"
echo " kbuildsycoca4"
echo " "
if [ -e "/etc/chakra/updates.conf" ] ; then
. /etc/chakra/updates.conf
/usr/bin/chakra-update-mime
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 chakra-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
/usr/bin/chakra-update-mime
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 chakra-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
/usr/bin/chakra-update-mime
if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then
/usr/bin/chakra-update-icons
fi
else
echo " > WARNING"
echo " The package chakra-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 $*