mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-10 21:24:40 +08:00
Cleanup
This commit is contained in:
parent
2a6f430a3d
commit
13b3b306ea
@ -133,10 +133,9 @@ e7c74185cc9a613106fd15bdbb31ea1a qtruby-4.9.80.tar.xz
|
|||||||
f29453b8cf02764a8c14b9b025038d9f qyoto-4.9.80.tar.xz
|
f29453b8cf02764a8c14b9b025038d9f qyoto-4.9.80.tar.xz
|
||||||
108b204fd895f7e93ead2c17987555a2 rocs-4.9.80.tar.xz
|
108b204fd895f7e93ead2c17987555a2 rocs-4.9.80.tar.xz
|
||||||
56968c8c9b796788edd3bf0d288cc5af smokegen-4.9.80.tar.xz
|
56968c8c9b796788edd3bf0d288cc5af smokegen-4.9.80.tar.xz
|
||||||
18fe3ba9344e8f9d64e80d007df3166b smokekde-4.9.80.tar.xz
|
|
||||||
c2bb665cc5bcd381dd7e369cb7bad494 smokeqt-4.9.80.tar.xz
|
c2bb665cc5bcd381dd7e369cb7bad494 smokeqt-4.9.80.tar.xz
|
||||||
4dbf2508fef591749b4dd6ce9332ee1c step-4.9.80.tar.xz
|
4dbf2508fef591749b4dd6ce9332ee1c step-4.9.80.tar.xz
|
||||||
fec883d904e7753937a6412b79d33352 superkaramba-4.9.80.tar.xz
|
fec883d904e7753937a6412b79d33352 superkaramba-4.9.80.tar.xz
|
||||||
b2e4b27ba06e314402ae8ccec7962149 svgpart-4.9.80.tar.xz
|
b2e4b27ba06e314402ae8ccec7962149 svgpart-4.9.80.tar.xz
|
||||||
5798908e66595a1f7b25f6ac481dea0d sweeper-4.9.80.tar.xz
|
5798908e66595a1f7b25f6ac481dea0d sweeper-4.9.80.tar.xz
|
||||||
|
08e2942268e5490876988cb2a12a3e14 smokekde-4.9.80.tar.xz
|
||||||
|
@ -7,9 +7,6 @@
|
|||||||
# include global config
|
# include global config
|
||||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||||
|
|
||||||
#
|
|
||||||
# package info
|
|
||||||
#
|
|
||||||
pkgname=kdebindings-pykde4
|
pkgname=kdebindings-pykde4
|
||||||
_pkgname=pykde4
|
_pkgname=pykde4
|
||||||
pkgver=${_kdever}
|
pkgver=${_kdever}
|
||||||
|
@ -1,43 +0,0 @@
|
|||||||
#
|
|
||||||
# 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
|
|
||||||
|
|
||||||
pkgname=polkit-kde-agent
|
|
||||||
pkgver=0.99.0
|
|
||||||
pkgrel=2
|
|
||||||
pkgdesc='KDE PolicyKit Authentication Agent'
|
|
||||||
arch=('i686' 'x86_64')
|
|
||||||
url='http://www.kde.org'
|
|
||||||
license=('GPL')
|
|
||||||
depends=('kdelibs' 'polkit-qt>=0.99.0')
|
|
||||||
replaces=('polkit-kde')
|
|
||||||
conflicts=('polkit-kde')
|
|
||||||
makedepends=('cmake' 'automoc4')
|
|
||||||
groups=("kde-uninstall" "kde-support")
|
|
||||||
source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
|
|
||||||
|
|
||||||
md5sums=('a02d3fddc6270a88bceaf3ba604c92f8')
|
|
||||||
|
|
||||||
build() {
|
|
||||||
cd ${srcdir}/${pkgname}-1-${pkgver}
|
|
||||||
|
|
||||||
cd ..
|
|
||||||
mkdir -p build
|
|
||||||
cd build
|
|
||||||
export XDG_CONFIG_DIRS=/etc/xdg
|
|
||||||
cmake ../${pkgname}-1-${pkgver} \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
|
||||||
-DCMAKE_SKIP_RPATH=ON
|
|
||||||
make || return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
cd ${srcdir}/build
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
}
|
|
@ -1,42 +0,0 @@
|
|||||||
#
|
|
||||||
# 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
|
|
||||||
|
|
||||||
pkgname=polkit-kde-agent
|
|
||||||
pkgver=0.99.0
|
|
||||||
pkgrel=1
|
|
||||||
pkgdesc='KDE PolicyKit Authentication Agent'
|
|
||||||
arch=('i686' 'x86_64')
|
|
||||||
url='http://www.kde.org'
|
|
||||||
license=('GPL')
|
|
||||||
depends=('kdelibs')
|
|
||||||
replaces=('polkit-kde')
|
|
||||||
makedepends=('cmake' 'automoc4')
|
|
||||||
groups=("kde-uninstall" "kde-support")
|
|
||||||
source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
|
|
||||||
|
|
||||||
md5sums=('a02d3fddc6270a88bceaf3ba604c92f8')
|
|
||||||
|
|
||||||
build() {
|
|
||||||
cd ${srcdir}/${pkgname}-1-${pkgver}
|
|
||||||
|
|
||||||
cd ..
|
|
||||||
mkdir -p build
|
|
||||||
cd build
|
|
||||||
export XDG_CONFIG_DIRS=/etc/xdg
|
|
||||||
cmake ../${pkgname}-1-${pkgver} \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
|
||||||
-DCMAKE_SKIP_RPATH=ON
|
|
||||||
make || return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
cd ${srcdir}/build
|
|
||||||
make DESTDIR=${pkgdir} install
|
|
||||||
}
|
|
@ -1,36 +0,0 @@
|
|||||||
#
|
|
||||||
# Platform 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
|
|
||||||
|
|
||||||
pkgname=polkit-qt
|
|
||||||
pkgver=0.99.0
|
|
||||||
pkgrel=2.1
|
|
||||||
pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API'
|
|
||||||
arch=('i686' 'x86_64')
|
|
||||||
url='http://www.kde.org'
|
|
||||||
license=('LGPL')
|
|
||||||
depends=('polkit' 'qt')
|
|
||||||
makedepends=('cmake' 'automoc4')
|
|
||||||
source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
|
|
||||||
md5sums=('1c5b4113a2a167624b5f716b4f03a219')
|
|
||||||
|
|
||||||
build() {
|
|
||||||
cd ${srcdir}
|
|
||||||
mkdir build
|
|
||||||
cd build
|
|
||||||
cmake ../${pkgname}-1-${pkgver} \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr
|
|
||||||
make
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
cd ${srcdir}/build
|
|
||||||
make DESTDIR=$pkgdir install
|
|
||||||
}
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
|||||||
Index: core/polkitqt1-authority.cpp
|
|
||||||
===================================================================
|
|
||||||
--- core/polkitqt1-authority.cpp (revision 1183413)
|
|
||||||
+++ core/polkitqt1-authority.cpp (working copy)
|
|
||||||
@@ -177,12 +177,17 @@
|
|
||||||
m_revokeTemporaryAuthorizationsCancellable = g_cancellable_new();
|
|
||||||
m_revokeTemporaryAuthorizationCancellable = g_cancellable_new();
|
|
||||||
|
|
||||||
+ GError *gerror = NULL;
|
|
||||||
if (pkAuthority == NULL) {
|
|
||||||
- pkAuthority = polkit_authority_get();
|
|
||||||
+ pkAuthority = polkit_authority_get_sync(NULL, &gerror);
|
|
||||||
+ if (gerror != NULL) {
|
|
||||||
+ setError(E_GetAuthority, gerror->message);
|
|
||||||
+ g_error_free(gerror);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pkAuthority == NULL) {
|
|
||||||
- (E_GetAuthority);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Index: agent/polkitqt1-agent-listener.cpp
|
|
||||||
===================================================================
|
|
||||||
--- agent/polkitqt1-agent-listener.cpp (revision 1183413)
|
|
||||||
+++ agent/polkitqt1-agent-listener.cpp (working copy)
|
|
||||||
@@ -73,9 +73,11 @@
|
|
||||||
{
|
|
||||||
GError *error = NULL;
|
|
||||||
|
|
||||||
- bool r = polkit_agent_register_listener(d->listener,
|
|
||||||
+ bool r = polkit_agent_listener_register(d->listener,
|
|
||||||
+ POLKIT_AGENT_REGISTER_FLAGS_NONE,
|
|
||||||
subject->subject(),
|
|
||||||
objectPath.toAscii().data(),
|
|
||||||
+ NULL,
|
|
||||||
&error);
|
|
||||||
if (error != NULL) {
|
|
||||||
qWarning() << QString("Cannot register authentication agent: %1").arg(error->message);
|
|
@ -1,14 +0,0 @@
|
|||||||
Index: agent/polkitqt1-agent-listener.cpp
|
|
||||||
===================================================================
|
|
||||||
--- agent/polkitqt1-agent-listener.cpp (revision 1183495)
|
|
||||||
+++ agent/polkitqt1-agent-listener.cpp (working copy)
|
|
||||||
@@ -66,7 +66,8 @@
|
|
||||||
qDebug("Destroying listener");
|
|
||||||
|
|
||||||
ListenerAdapter::instance()->removeListener(this);
|
|
||||||
- g_object_unref(d->listener);
|
|
||||||
+ if (d->listener != NULL)
|
|
||||||
+ g_object_unref(d->listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Listener::registerListener(PolkitQt1::Subject *subject, const QString &objectPath)
|
|
Loading…
Reference in New Issue
Block a user