Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=ee9fe9dca72fd8f903be8392e63faccb264dd117
commit ee9fe9dca72fd8f903be8392e63faccb264dd117
Author: Devil505
Date: Thu Jan 27 17:49:47 2011 +0100
polkit-qt-1-0.99.0-1-i686
* forgot to remove patch
diff --git a/source/xlib/polkit-qt-1/FrugalBuild
b/source/xlib/polkit-qt-1/FrugalBuild
index 1bb97e2..11a855e 100644
--- a/source/xlib/polkit-qt-1/FrugalBuild
+++ b/source/xlib/polkit-qt-1/FrugalBuild
@@ -16,9 +16,7 @@ depends=("libqtgui>=$_F_kde_qtver" 'libgcc'
"libqtdbus>=$_F_kde_qtver" 'polkit>=
up2date="Flasttar $_F_kde_mirror/$_F_kde_dirname"
conflicts=("polkit-qt")
replaces=("${conflicts[@]}")
-source=($source glib-ftbfs.diff)
-sha1sums=('9f2149d6b9e27be6b8b9372191ec94bcd40d4a1a' \
- '30cf354d9a29c9ac4677a4bdf61091c7ec2662d6')
+sha1sums=('9f2149d6b9e27be6b8b9372191ec94bcd40d4a1a')
# optimization OK
diff --git a/source/xlib/polkit-qt-1/glib-ftbfs.diff
b/source/xlib/polkit-qt-1/glib-ftbfs.diff
deleted file mode 100644
index 56703f5..000
--- a/source/xlib/polkit-qt-1/glib-ftbfs.diff
+++ /dev/null
@@ -1,258 +0,0 @@
-Index: polkit-qt-1-0.95.1/CMakeLists.txt
-===
polkit-qt-1-0.95.1.orig/CMakeLists.txt 2010-07-02 09:59:07.735794971
-0400
-+++ polkit-qt-1-0.95.1/CMakeLists.txt 2010-07-02 10:00:48.545794971 -0400
-@@ -17,6 +17,8 @@
- pkg_check_modules (POLKIT-1 REQUIRED polkit-gobject-1>=0.95)
- pkg_check_modules (POLKIT-1_AGENT REQUIRED polkit-agent-1>=0.95)
-
-+add_definitions(-DQT_NO_KEYWORDS)
-+
- message(STATUS " ${POLKIT-1_INCLUDE_DIRS} ===")
-
- include_directories(
-Index: polkit-qt-1-0.95.1/agent/listeneradapter.cpp
-===
polkit-qt-1-0.95.1.orig/agent/listeneradapter.cpp 2010-07-02
09:59:04.765794971 -0400
-+++ polkit-qt-1-0.95.1/agent/listeneradapter.cpp 2010-07-02
09:59:21.325794971 -0400
-@@ -61,7 +61,7 @@
- {
- Listener *listItem;
-
--foreach(listItem, m_listeners) {
-+Q_FOREACH(listItem, m_listeners) {
- Q_ASSERT(listItem);
-
- if (listItem->listener() == listener)
-Index: polkit-qt-1-0.95.1/agent/polkitqt1-agent-session.cpp
-===
polkit-qt-1-0.95.1.orig/agent/polkitqt1-agent-session.cpp 2010-07-02
09:58:56.375794971 -0400
-+++ polkit-qt-1-0.95.1/agent/polkitqt1-agent-session.cpp 2010-07-02
09:59:21.325794971 -0400
-@@ -101,25 +101,25 @@
- {
- qDebug() << "COMPLETED";
- Session *session = (Session *)user_data;
--emit((Session *)user_data)->completed(gained_authorization);
-+Q_EMIT((Session *)user_data)->completed(gained_authorization);
- }
-
- void Session::Private::request(PolkitAgentSession *s, gchar *request,
gboolean echo_on, gpointer user_data)
- {
- qDebug() << "REQUEST";
--emit((Session *)user_data)->request(QString::fromUtf8(request), echo_on);
-+Q_EMIT((Session *)user_data)->request(QString::fromUtf8(request),
echo_on);
- }
-
- void Session::Private::showError(PolkitAgentSession *s, gchar *text, gpointer
user_data)
- {
- qDebug() << "showError";
--emit((Session *)user_data)->showError(QString::fromUtf8(text));
-+Q_EMIT((Session *)user_data)->showError(QString::fromUtf8(text));
- }
-
- void Session::Private::showInfo(PolkitAgentSession *s, gchar *text, gpointer
user_data)
- {
- qDebug() << "showInfo";
--emit((Session *)user_data)->showInfo(QString::fromUtf8(text));
-+Q_EMIT((Session *)user_data)->showInfo(QString::fromUtf8(text));
- }
-
- //
-Index: polkit-qt-1-0.95.1/core/polkitqt1-authority.cpp
-===
polkit-qt-1-0.95.1.orig/core/polkitqt1-authority.cpp 2010-07-02
09:58:38.075794970 -0400
-+++ polkit-qt-1-0.95.1/core/polkitqt1-authority.cpp2010-07-02
09:59:21.325794971 -0400
-@@ -208,7 +208,7 @@
- QList seats;
- qVariantValue (msg.arguments()[0]) >> seats;
- // it can be multiple seats present so connect all their signals
--foreach(const QString &seat, seats) {
-+Q_FOREACH(const QString &seat, seats) {
- seatSignalsConnect(seat);
- }
- }
-@@ -244,7 +244,7 @@
- void Authority::Private::dbusFilter(const QDBusMessage &message)
- {
- if (message.type() == QDBusMessage::SignalMessage) {
--emit q->consoleKitDBChanged();
-+Q_EMIT q->consoleKitDBChanged();
-
- // TODO: Test this with the multiseat support
- if (message.member() == "SeatAdded")
-@@ -278,7 +278,7 @@
-
- void Authority::Private::pk_config_changed()
- {
--emit Authority::instance()->configChanged();
-+Q_EMIT Authority::instance()->configChanged();
- }
-
- PolkitAuthority *Authority::polkitAuthority() const
-@@ -361,7 +361,7 @@
- return;
- }
- if (pkResult != NULL) {
--emit
authority->checkAuthorizationFinished(polkitResultToResult(pkResult)
