Remove patches from packages, we have them on git, remove backport

This commit is contained in:
Manuel 2012-11-17 09:50:07 +00:00
parent 2e0b21aa52
commit 6e00963c16
2 changed files with 10 additions and 58 deletions

View File

@ -13,7 +13,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname="kdelibs"
arch=('x86_64')
pkgver=${_kdever}
pkgrel=2
pkgrel=1
pkgdesc="KDE Core Libraries"
url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL')
@ -21,7 +21,7 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
depends=("${_qtpkg}>=${_qtver}" "kde-common>=${_kdever}" "oxygen-icons>=${_kdever}"
'shared-mime-info' 'upower' 'udisks' 'xz>=5.0.0' 'enchant' 'jasper' 'openexr' 'giflib'
'strigi' 'libxtst' 'soprano>=2.7.56' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt>=0.98.1'
'libxss' 'phonon' 'shared-desktop-ontologies>=0.7' 'attica>=0.2.0' 'krb5' 'libxcursor'
'libxss' 'phonon' 'shared-desktop-ontologies>=0.7' 'attica>=0.2.0' 'krb5' 'libxcursor'
'hicolor-icon-theme' 'libdbusmenu-qt' 'grantlee-git' 'media-player-info' 'qtwebkit' 'systemd')
makedepends=('pkg-config' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'aspell' 'hspell' 'shared-mime-info'
'docbook-xsl' 'docbook-xml' 'bzip2>=1.0.6' 'libzip')
@ -41,18 +41,13 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz
01_chakra_tag.patch
02_kde_applications_menu.patch
03_chakra_menu.patch
MergeDir.patch
save_path_regression.diff)
MergeDir.patch)
md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
'e9ac43de85dc73309ab6c89ebcf5dc50' # 01_chakra_tag.patch
'e94450ba5430ea9c1e33bad9ae38ca2d' # 02_kde_applications_menu.patch
'53b85403e4dd8f9146933c52ca23243e' # 03_chakra_menu.path
'f442698bae9d4ffb26f6df9457d7fc5a' # MergeDir.patch
'185181db5380b2604b94076c44c7a661') # save_path_regression.diff
'e9ac43de85dc73309ab6c89ebcf5dc50' # 01_chakra_tag.patch
'e94450ba5430ea9c1e33bad9ae38ca2d' # 02_kde_applications_menu.patch
'53b85403e4dd8f9146933c52ca23243e' # 03_chakra_menu.path
'f442698bae9d4ffb26f6df9457d7fc5a') # MergeDir.patch
#
# build function
#
build() {
# main patches
msg "applying main patchset ..."
@ -62,22 +57,20 @@ build() {
patch -Np1 -i ${srcdir}/03_chakra_menu.patch
# right positioning of applications' entries in kmenu
patch -p1 -i ${srcdir}/MergeDir.patch
# Issue https://git.reviewboard.kde.org/r/106475/
patch -p1 -i "${srcdir}"/save_path_regression.diff
cd ..
rm -rf build
mkdir -p build && cd build
cmake ../${pkgname}-${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_DISTRIBUTION_TEXT='Chakra ' \
-DKDE_DEFAULT_HOME='.kde4' \
-DWITH_FAM=OFF \
-DKAUTH_BACKEND=PolkitQt-1 \
-DWITH_HUpnp=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
@ -92,18 +85,4 @@ package() {
# 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
# 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/chakra/patches/${_origname} &>/dev/null
for i in ${startdir}/*.patch; do
msg "$i"
cp $i ${pkgdir}/usr/share/chakra/patches/${_origname}/ &>/dev/null
done
else
warning "no patches found, skipping to include them into the package..."
fi
}

View File

@ -1,27 +0,0 @@
commit 793e2a69f8aa193b60494b03d51c5fd44373c0e7
Author: Jonathan Marten <jjm@keelhaul.me.uk>
Date: Wed Nov 7 12:45:03 2012 +0000
Fix regression: specified or remembered save path is not used
As requested on review https://git.reviewboard.kde.org/r/106475/
diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp
index 65deca2..e755aae 100644
--- a/kfile/kfilewidget.cpp
+++ b/kfile/kfilewidget.cpp
@@ -2593,8 +2593,12 @@ KUrl KFileWidget::getStartUrl( const KUrl& startDir,
}
else // not special "kfiledialog" URL
{
- if (!startDir.isRelative()) // has directory, maybe with filename
- {
+ // We can use startDir as the starting directory if either:
+ // (a) it has a directory part, or
+ // (b) there is a scheme (protocol), and it is not just "file".
+ if (!startDir.directory().isEmpty() ||
+ (!startDir.scheme().isEmpty() && !startDir.isLocalFile()))
+ { // can use start directory
ret = startDir; // will be checked by stat later
// If we won't be able to list it (e.g. http), then use default
if ( !KProtocolManager::supportsListing( ret ) ) {