Commit 0fdb020b authored by philm's avatar philm

appset-qt: update to 0.5.80 (0.6.pre)

parent 156172cc
......@@ -20,7 +20,7 @@ pkgname=('kdebase-workspace'
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=2
pkgrel=3
pkgdesc="split package"
url="http://www.kde.org"
......@@ -35,7 +35,7 @@ depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever
makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-python>=${_kdever}"
"kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba'
'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2' 'boost')
'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2')
source=($_mirror/${pkgbase}-$_kdever.tar.bz2
mishaaq-kcm_touchpad-00370b5.tar.gz
......@@ -73,9 +73,6 @@ source=($_mirror/${pkgbase}-$_kdever.tar.bz2
# "fix" some sytemsettings modules that need root access
fix_root-only-kcms.patch
# fix powerdevil
# trunk_powerdevil.patch
# experimental, software transparency for plasma panels
# feature_plasma-transparent-panel-v4-rb#472.patch
......@@ -89,8 +86,7 @@ source=($_mirror/${pkgbase}-$_kdever.tar.bz2
# feature_history-notifications-enable-disable-kde#119207.patch
# feature_kdm-plymouth.patch
# shutdown-fix.patch
rev_monotonic_clock.patch
0001-be-posix-compliant-about-monotonic-clock-detection.patch
)
md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
......@@ -122,8 +118,7 @@ md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
# '894815a80f99a9a0dee1adbcda49b161' # feature_battery-tooltip.patch
# '9b97ac1b4deb8d0c8ca7afffb80b4320' # feature_history-notifications-enable-disable-kde#119207.patch
# '42b3b5e09372c57910c3435e63e2dfd6' # feature_kdm-plymouth.patch
# 'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch
'db8077776b1bc6e796fe227bbc0ef63a' # rev_monotonic_clock.patch
'4be7ee4e669ededc3878830bc2f24f46' # 0001-be-posix-compliant-about-monotonic-clock-detection.patch
)
#
......@@ -159,7 +154,7 @@ build()
# patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch
msg "applying upstream patches ..."
patch -Np1 -R < ${srcdir}/rev_monotonic_clock.patch
patch -Np1 -i ${srcdir}/0001-be-posix-compliant-about-monotonic-clock-detection.patch
msg "starting workspace build ..."
......
commit 858927c9d650697e8bd74697b8815c17cc93402d
Author: Oswald Buddenhagen <ossi@kde.org>
Date: Sun May 15 12:19:32 2011 +0200
use monotonic clock if available
this avoids that clock jumps (e.g., ntp syncs) cause timeouts.
fixes bug 269522
diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt
index 0fbf35e..e94a3b9 100644
--- a/kdm/backend/CMakeLists.txt
+++ b/kdm/backend/CMakeLists.txt
@@ -68,6 +68,9 @@ if(UTIL_LIBRARIES)
target_link_libraries( kdm ${UTIL_LIBRARIES} )
endif(UTIL_LIBRARIES)
target_link_libraries( kdm ${POSIX4_LIBRARIES} )
+if(QT_RT_LIBRARY)
+ target_link_libraries( kdm ${QT_RT_LIBRARY} )
+endif(QT_RT_LIBRARY)
if(KDE4_ENABLE_FINAL)
macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/kdm_final_cpp.cpp ${confci})
diff --git a/kdm/backend/dm.c b/kdm/backend/dm.c
index 13d75fb..1120bd8 100644
--- a/kdm/backend/dm.c
+++ b/kdm/backend/dm.c
@@ -1163,7 +1163,7 @@ mainLoop(void)
fd_set reads;
debug("mainLoop\n");
- time(&now);
+ updateNow();
while (
#ifdef XDMCP
anyListenSockets() ||
@@ -1213,7 +1213,7 @@ mainLoop(void)
reads = wellKnownSocketsMask;
nready = select(wellKnownSocketsMax + 1, &reads, 0, 0, tvp);
debug("select returns %d\n", nready);
- time(&now);
+ updateNow();
#ifdef NEED_ENTROPY
addTimerEntropy();
#endif
diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h
index 5895b5f..af8ce54 100644
--- a/kdm/backend/dm.h
+++ b/kdm/backend/dm.h
@@ -403,6 +403,17 @@ void cancelShutdown(void);
int TTYtoVT(const char *tty);
int activateVT(int vt);
+#ifdef _POSIX_MONOTONIC_CLOCK
+# define updateNow() \
+ do { \
+ struct timespec ts; \
+ clock_gettime(CLOCK_MONOTONIC, &ts); \
+ now = ts.tv_sec; \
+ } while (0)
+#else
+# define updateNow() time(&now)
+#endif
+
/* in ctrl.c */
void openCtrl(struct display *d);
void closeCtrl(struct display *d);
diff --git a/kdm/backend/session.c b/kdm/backend/session.c
index 0cd82cf..7fbdfca 100644
--- a/kdm/backend/session.c
+++ b/kdm/backend/session.c
@@ -416,7 +416,8 @@ openGreeter()
gSet(&grttalk);
if (grtproc.pid > 0)
return;
- if (time(0) < lastStart + 10) /* XXX should use some readiness indicator instead */
+ updateNow();
+ if (now < lastStart + 10) /* XXX should use some readiness indicator instead */
sessionExit(EX_UNMANAGE_DPY);
ASPrintf(&name, "greeter for display %s", td->name);
debug("starting %s\n", name);
@@ -446,7 +447,8 @@ openGreeter()
sessionExit(EX_UNMANAGE_DPY);
}
debug("%s ready\n", name);
- time(&lastStart);
+ updateNow();
+ lastStart = now;
}
int
@@ -577,7 +579,7 @@ manageSession(void)
/* NOTREACHED */
#endif
- tdiff = time(0) - td->hstent->lastExit - td->openDelay;
+ tdiff = now - td->hstent->lastExit - td->openDelay;
if (autoLogon(tdiff)) {
if (!verify(conv_auto, False))
goto gcont;
commit 23863a99399cbb274f6756146b3c08de2efa0c7f
Author: John Tapsell <johnflux@gmail.com>
Date: Thu Apr 7 10:59:20 2011 +0100
Fix accidental removal of a #include, when adding freebsd support. This broke the lmsensors at minimum
BUG: 270246
BUG: 270246
CCMAIL: naylor.b.david@gmail.com
diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
index e780be6..9aae890 100644
--- a/ksysguard/ksysguardd/modules.h
+++ b/ksysguard/ksysguardd/modules.h
@@ -23,6 +23,7 @@
#ifndef KSG_MODULES_H
#define KSG_MODULES_H
+#include "config-ksysguardd.h"
#include "Command.h"
#include "conf.h"
#include "ksysguardd.h"
--- kdebase-workspace-4.6.2/kdm/config.def~ 2011-04-08 00:29:48.291941154 -0700
+++ kdebase-workspace-4.6.2/kdm/config.def 2011-04-08 00:32:04.738607619 -0700
@@ -38,7 +38,7 @@
# define HALT_CMD "/usr/sbin/shutdown -h now"
# define REBOOT_CMD "/usr/sbin/shutdown -r now"
#elif defined(BSD) || defined(__linux__)
-# define HALT_CMD "/sbin/shutdown -p now"
+# define HALT_CMD "/sbin/shutdown -h now"
# define REBOOT_CMD "/sbin/shutdown -r now"
#elif defined(__SVR4)
# define HALT_CMD "/usr/sbin/halt"
This diff is collapsed.
......@@ -16,7 +16,7 @@ arch=('i686' 'x86_64')
#pkgver=${_kdever}
pkgver=4.6.0
pkgrel=1
pkgrel=2
pkgdesc="KDE Pim Runtime"
url="http://www.kde.org"
......@@ -27,8 +27,10 @@ depends=("kdepimlibs>=${_kdever}" "kdebase-runtime" "kdelibs>=${_kdever}")
makedepends=('pkgconfig' 'cmake' 'automoc4')
groups=("kde" "kdepim" "kde-uninstall" "kde-minimal")
source=($_mirror/${pkgbase}-$pkgver.tar.bz2)
md5sums=('b7b5409cb22d57bd817a6d653f714bd7')
source=($_mirror/${pkgbase}-$pkgver.tar.bz2
disable-l10n.patch)
md5sums=('b7b5409cb22d57bd817a6d653f714bd7'
'46dbfb8cdd364e6434f7dc499105bdfb')
#
# build and install
......@@ -39,6 +41,7 @@ build()
cd ${srcdir}
mkdir -p build
cd build
patch -p1 -i "${srcdir}"/disable-l10n.patch
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=${_build_type} \
......
......@@ -3,7 +3,7 @@
# Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626
pkgname=appset-qt
pkgver=0.5.1
pkgver=0.5.80
pkgrel=1
pkgdesc="An advanced and feature rich Package Manager Frontend"
arch=('i686' 'x86_64')
......@@ -12,12 +12,12 @@ license=('GPL2')
depends=('qt>=4.7')
optdepends=('ccr: For Community Repository support')
install=${pkgname}.install
source=(http://sourceforge.net/projects/appset/files/appset-qt/0.5/$pkgver/$pkgname-$pkgver-sources.tar.gz
source=(http://sourceforge.net/projects/appset/files/appset-qt/0.6/0.6.0/appset-qt-0.6.0pre-sources.tar.gz
http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz
http://chakra-project.org/sources/$pkgname/$pkgname-0.4.99-chakra.patch
http://chakra-project.org/sources/$pkgname/$pkgname-0.6.0-chakra.patch
#http://chakra-project.org/sources/$pkgname/add-chinese-taiwan.patch
#http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.5.0.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0-new.tar.gz
http://chakra-project.org/sources/$pkgname/appset-qt_de-0.6.0.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_es-0.5.0.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.5.0.tar.gz
......@@ -25,12 +25,12 @@ source=(http://sourceforge.net/projects/appset/files/appset-qt/0.5/$pkgver/$pkgn
#http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz
#http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.5.0.tar.gz
)
md5sums=(337c0cb0b05c8da59b4cfde58d18e61e
md5sums=(b75e255351a4497a54179650aab563ff
87f5f278e3fe67ed2cd6165c2835d81b
f193b069c8ac4d392d0d1b6c9ca3469f
440d7fee81cd6b88c13987d5a583ee87
#7de9e3d87fb4258174af214b291b5444 # add-chinese-taiwan.patch
#c2fbac4cab7443f60ee00e48a4d537e3 # appset-qt_ca.0.5.0.tar.gz
#e92f04ce53565ffa396251c4b044ef1c # appset-qt_de-0.5.0-new.tar.gz
ee8905fa99ff80485be3d69d2ce7c4f0 # appset-qt_de-0.6.0.tar.gz
#b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz
#f04f8aa20631feca91bbde3519bfcf48 # appset-qt_es.0.5.0.tar.gz
#fa69077be4ac7c409df87ab256c97919 # appset-qt_fr.0.5.0.tar.gz
......@@ -40,23 +40,26 @@ md5sums=(337c0cb0b05c8da59b4cfde58d18e61e
)
build() {
cd $srcdir/$pkgname-$pkgver-sources
cd $srcdir/$pkgname-0.6.0pre-sources
# copy oxygen icons
cp -v ../*png Qt/AppSet-Qt
# patch it for Chakra GNU/Linux
patch -Np1 -i ${startdir}/src/$pkgname-0.4.99-chakra.patch
patch -Np1 -i ${startdir}/src/$pkgname-0.6.0-chakra.patch
# add chakra translations (check upstream)
#patch -Np1 -i ${startdir}/src/add-chinese-taiwan.patch
#cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt
#cp -v ../appset-qt*.ts Qt/AppSet-Qt
cp -v ../appsetrepoeditor-qt*.ts Qt/AppSetRepoEditor-Qt
cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt
cp -v ../appset-qt*.ts Qt/AppSet-Qt
# check for updated strings
cd Qt/AppSet-Qt
lupdate *.cpp *.ui *.h -ts *.ts
cd ../AppSetTray-Qt
lupdate *.cpp *.h -ts *.ts
cd ../AppSetRepoEditor-Qt
lupdate *.cpp *.ui *.h -ts *.ts
cd ../..
qmake PREFIX=/usr -Wnone
......@@ -64,17 +67,18 @@ build() {
#localization
lrelease Qt/AppSet-Qt/*.ts
lrelease Qt/AppSetTray-Qt/*.ts
lrelease Qt/AppSetRepoEditor-Qt/*.ts
make || return 1
}
package() {
cd $srcdir/$pkgname-$pkgver-sources
cd $srcdir/$pkgname-0.6.0pre-sources
make INSTALL_ROOT="$pkgdir/" install
#helper daemon
install -m 755 -d "$pkgdir/etc/rc.d" || return 1
install -m 755 "$srcdir/$pkgname-$pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
install -m 755 "$srcdir/$pkgname-0.6.0pre-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper"
}
......@@ -8,7 +8,8 @@
# package info
#
pkgname=tribe
pkgver=2011.04_20110603
#pkgver=2011.04r1
pkgver=20110613.KU
pkgrel=1
_codename=Aida
pkgdesc="Tribe - Chakra LiveCD Installer"
......@@ -22,11 +23,9 @@ provides=('tribe')
replaces=('kdemod-tribe-svn' 'kdemod-tribe')
conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager')
options=('!splithdr' '!splitdbg' 'sign')
source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz"
"http://chakra-project.org/sources/tribe/RELEASE_NOTES_20110603.html")
source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz")
md5sums=('dfde16097f784d3c6085ab739ca7df1c'
'b4bb4472cd8e190a88fbc2e27d1c7bd8')
md5sums=('d2ccc5b14880bf098b5558b3d23957bf')
groups=('kde-uninstall')
install=tools-tribe.install
......@@ -80,7 +79,7 @@ package()
cd "${srcdir}/$pkgname"
msg "Make successful, installing..."
make DESTDIR=$startdir/pkg install || return 1
cp -vf ${srcdir}/RELEASE_NOTES_20110603.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
#cp -vf ${srcdir}/RELEASE_NOTES_201104r1.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html
# remove nasty files
find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment