[Frugalware-git] kdetesting: cdlabelgen-4.1.0-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=a176fb6a0316fbca982c90124d507ef66b5aba3e commit a176fb6a0316fbca982c90124d507ef66b5aba3e Author: Miklos Vajna Date: Wed Jan 20 02:21:24 2010 +0100 cdlabelgen-4.1.0-1-i686 - add koverartist to replaces() diff --git a/source/apps-extra/cdlabelgen/FrugalBuild b/source/apps-extra/cdlabelgen/FrugalBuild index 6b57dcf..5f8b645 100644 --- a/source/apps-extra/cdlabelgen/FrugalBuild +++ b/source/apps-extra/cdlabelgen/FrugalBuild @@ -7,6 +7,7 @@ pkgrel=1 pkgdesc="Generates frontcards and traycards for inserting in CD/DVD jewel cases" url="http://www.aczoom.com/tools/cdinsert/"; depends=('perl') +replaces=('koverartist') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep latest|sed 's/.* \([0-9\.]*\), .*/\1/'" diff --git a/source/kde-extra/koverartist/FrugalBuild b/source/kde-extra/koverartist/FrugalBuild deleted file mode 100644 index 15dbcb2..000 --- a/source/kde-extra/koverartist/FrugalBuild +++ /dev/null @@ -1,20 +0,0 @@ -# Compiling Time: 0.36 SBU -# Maintainer: crazy -# Contributor: BMH1980 - - -pkgname=koverartist -pkgver=0.5 -pkgrel=1 -pkgdesc="KoverArtist is a program for the creation of covers for cd/dvd cases and boxes." -license="GPL2" -depends=('libstdc++' 'libdrm' 'libxxf86vm' 'kdelibs>=3.5.5') -groups=('kde-extra') -archs=('i686' 'x86_64') -_F_cd_path="$pkgname" -_F_kde_id="38195" -Finclude kde -source=(http://members.inode.at/499177/software/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('2fff3824c7b72a769dd2960bdc38d4dd5ff9e263') - -# optimization OK ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: kdebase-workspace-4.3.4-8-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=b3402dc9e4814d2797ec5676e6a35606ae3756e2 commit b3402dc9e4814d2797ec5676e6a35606ae3756e2 Author: Miklos Vajna Date: Wed Jan 20 02:16:49 2010 +0100 kdebase-workspace-4.3.4-8-i686 - add kompose to replaces() for libkwineffects diff --git a/source/kde-extra/kompose/FrugalBuild b/source/kde-extra/kompose/FrugalBuild deleted file mode 100644 index 07831ca..000 --- a/source/kde-extra/kompose/FrugalBuild +++ /dev/null @@ -1,33 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: crazy -# Maintainer: Karoly CZOVEK - -pkgname=kompose -pkgver=0.5.4 -pkgrel=1 -pkgdesc="A fullscreen task manager for KDE" -url="http://kompose.berlios.de/"; -depends=('kdebase>=3.5.5' 'imlib2' 'libxcomposite' 'libxdamage') -groups=('kde-extra') -archs=('i686' 'x86_64') -_F_berlios_ext=".tar.bz2" -Finclude berlios -options=('scriptlet') -source=($source \ - kompose-0.5.4-ktoolbar.patch admin.patch) -sha1sums=('4a17d90cadc9dadc0e427ea1bf94e41ee8a9111c' \ - '353c9377b23102ca6f88b10ca02f5e96e5ef6a22' \ - 'e23da9c11c237bb94f4e266c7429645588f3ef7e') - -build() -{ - Fcd - Fpatchall - make -f Makefile.cvs || Fdie - Fmake --disable-debug --without-debug - Fmakeinstall - Fmv /usr/share/apps/kompose/icons /usr/share/icons -} - - -# optimization OK diff --git a/source/kde-extra/kompose/admin.patch b/source/kde-extra/kompose/admin.patch deleted file mode 100644 index 5a96096..000 --- a/source/kde-extra/kompose/admin.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naurp kompose-0.5.4/admin/cvs.sh kompose-0.5.4-p/admin/cvs.sh kompose-0.5.4/admin/cvs.sh 2005-09-13 19:41:39.0 +0200 -+++ kompose-0.5.4-p/admin/cvs.sh 2006-12-23 03:26:10.0 +0100 -@@ -32,7 +32,7 @@ check_autotool_versions() - required_autoconf_version="2.53 or newer" - AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` - case $AUTOCONF_VERSION in -- Autoconf*2.5* | autoconf*2.5* ) : ;; -+ Autoconf*2.5* | autoconf*2.6* ) : ;; - "" ) - echo "*** AUTOCONF NOT FOUND!." - echo "*** KDE requires autoconf $required_autoconf_version" -@@ -47,7 +47,7 @@ esac - - AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` - case $AUTOHEADER_VERSION in -- Autoconf*2.5* | autoheader*2.5* ) : ;; -+ Autoconf*2.5* | autoheader*2.6* ) : ;; - "" ) - echo "*** AUTOHEADER NOT FOUND!." - echo "*** KDE requires autoheader $required_autoconf_version" -@@ -68,7 +68,7 @@ case $AUTOMAKE_STRING in - echo "*** KDE requires automake $required_automake_version" - exit 1 - ;; -- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) - echo "*** $AUTOMAKE_STRING found." - UNSERMAKE=no - ;; diff --git a/source/kde-extra/kompose/kompose-0.5.4-ktoolbar.patch b/source/kde-extra/kompose/kompose-0.5.4-ktoolbar.patch deleted file mode 100644 index 1dee602..000 --- a/source/kde-extra/kompose/kompose-0.5.4-ktoolbar.patch +++ /dev/null @@ -1,11 +0,0 @@ /tmp/kompose-0.5.4/src/komposetaskprefswidget.cpp 2005-07-06 00:32:41.0 +0200 -+++ src/komposetaskprefswidget.cpp 2006-03-06 11:27:43.0 +0100 -@@ -28,7 +28,7 @@ - KomposeTaskPrefsWidget::KomposeTaskPrefsWidget(KomposeTaskWidget *parent, const char *name) - : QDockArea(Qt::Horizontal , QDockArea::Normal, parent, name) - { -- KToolBar* pToolBar = new KToolBar( this, i18n("Task Actions") ); -+ KToolBar* pToolBar = new KToolBar( this, i18n("Task Actions").latin1() ); - pToolBar->setLabel(i18n("Task")); - pToolBar->setResizeEnabled ( false ); - pToolBar->setMovingEnabled ( false ); diff --git a/source/kde/kdebase-workspace/FrugalBuild b/source/kde/kdebase-workspace/FrugalBuild index 072ad4e..315f8e2 100644 --- a/source/kde/kdebase-workspace/FrugalBuild +++ b/source/kde/kdebase-workspace/FrugalBuild @@ -24,7 +24,7 @@ source=("${sour...@]}" \ kdm-make_it_cool.diff\ default-fonts.patch) replaces=('ksensors' 'katapult' 'tastymenu' 'kbfx' 'kdesktop-menu' \ - 'kicker-compiz' 'taskbar-compiz' 'mtaskbar' 'ksmoothdock') + 'kicker-compiz' 'taskbar-compiz' 'mtaskbar' 'ksmoothdock' 'kompose') sha1sums=('5b43447139d22247d5bc2deee8e3a97f0bbf' \ 'da461b91ab3ffaa5d29e2c88448ed61ed280b652' \ '5b16b82ff8f0084d15db9adf98c423906ff816e9' \ ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: koffice-2.1.0-2-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=4e8fbd027b13973724b6cee45cc9f154aad9809f commit 4e8fbd027b13973724b6cee45cc9f154aad9809f Author: Miklos Vajna Date: Wed Jan 20 02:13:11 2010 +0100 koffice-2.1.0-2-i686 - add knoda to replaces() for kexidb diff --git a/source/kde-extra/knoda/FrugalBuild b/source/kde-extra/knoda/FrugalBuild deleted file mode 100644 index f5e86df..000 --- a/source/kde-extra/knoda/FrugalBuild +++ /dev/null @@ -1,18 +0,0 @@ -# Compiling Time: 3.14 SBU -# Maintainer: crazy -# Contributor: BMH1980 - -pkgname=knoda -pkgver=0.8.3 -pkgrel=2 -pkgdesc="knoda is a database frontend for KDE." -license="GPL2" -groups=('kde-extra') -archs=('i686' 'x86_64') -depends=('file' 'libxi' 'libgl' 'libstdc++' 'libdrm' 'libxxf86vm' 'libxmu' 'kdelibs>=3.5.10-3' 'hk_classes>=0.8.3') -_F_sourceforge_ext=".tar.bz2" -_F_kde_defaults=0 -Finclude sourceforge kde -sha1sums=('a61810a568f619291fade5586165dbec0460532a') - -# optimization OK diff --git a/source/kde-extra/koffice/FrugalBuild b/source/kde-extra/koffice/FrugalBuild index a742f16..1265543 100644 --- a/source/kde-extra/koffice/FrugalBuild +++ b/source/kde-extra/koffice/FrugalBuild @@ -13,7 +13,7 @@ depends=('libkexif' "kdebase>=$_F_kde_ver" 'libpqxx=2.6.9' 'wv2' 'libmysqlclient 'python>=2.6' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt4>=0.8.0' 'imagemagick' 'readline') makedepends=("${makedepen...@]}" 'doxygen' 'qt-docs>=3.3.6' 'mysql' 'pkgconfig' 'postgresql') groups=('kde-extra') -replaces=('keximdb') +replaces=('keximdb' 'knoda') archs=('i686' 'x86_64' 'ppc') _F_kde_split_docs=1 options=('nodocs') ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: kdegames-4.3.4-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=139a3fcd50b802ba128891e8b10496250cbdc026 commit 139a3fcd50b802ba128891e8b10496250cbdc026 Author: Miklos Vajna Date: Wed Jan 20 02:10:29 2010 +0100 kdegames-4.3.4-1-i686 - add knights to replaces() diff --git a/source/kde-extra/knights/FrugalBuild b/source/kde-extra/knights/FrugalBuild deleted file mode 100644 index d1d36b4..000 --- a/source/kde-extra/knights/FrugalBuild +++ /dev/null @@ -1,27 +0,0 @@ -# Compiling Time: 0.74 SBU -# Maintainer: Devil505 - -pkgname=knights -pkgver=0.6.4_beta -pkgrel=1 -pkgdesc="Knights is a graphical chess interface designed for use with the K Desktop Environment." -_F_sourceforge_broken_up2date=1 -_F_kde_defaults=0 -Finclude sourceforge kde -url="http://mtvg.sourceforge.net/"; -depends=('kdelibs' 'kdebase' 'libogg' 'xfsprogs-attr' 'libgl' 'libxmu' 'libxi' 'libxrandr' 'libxcursor' 'libxinerama' \ - 'libxft' 'libpng' 'libsm' 'libgcc' 'libxdamage') -options=('scriptlet') -groups=('kde-extra') -archs=('i686' 'x86_64') -_F_cd_path="$pkgname" -sha1sums=('af8f5d59b7d96b643a7738911f3d04642e2fbec0') - -build() -{ - Fcd - sed -ie '46s/;//' knights/audio.h - Fbuild -} - -# optimization OK diff --git a/source/kde/kdegames/FrugalBuild b/source/kde/kdegames/FrugalBuild index 9470102..63d5423 100644 --- a/source/kde/kdegames/FrugalBuild +++ b/source/kde/kdegames/FrugalBuild @@ -9,7 +9,7 @@ archs=('i686' 'x86_64') _F_cmakekde_final=OFF provides=('ksudoku') -replaces=('ksudoku' 'boson') +replaces=('ksudoku' 'boson' 'knights') conflicts=('ksudoku') Finclude kde ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: kmobiletools-1066922-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=db5543e2f0f9ca198d5251f8ac229b4bc7496a80 commit db5543e2f0f9ca198d5251f8ac229b4bc7496a80 Author: Miklos Vajna Date: Wed Jan 20 02:07:16 2010 +0100 kmobiletools-1066922-1-i686 - bump to kde4 snapshot diff --git a/source/kde-extra/kmobiletools/FrugalBuild b/source/kde-extra/kmobiletools/FrugalBuild index 09c3393..0251129 100644 --- a/source/kde-extra/kmobiletools/FrugalBuild +++ b/source/kde-extra/kmobiletools/FrugalBuild @@ -2,23 +2,19 @@ # Maintainer: crazy pkgname=kmobiletools -pkgver=0.5.0_beta3 -pkgrel=8 +pkgver=1066922 +pkgrel=1 pkgdesc="A complete management system for mobile phones." ## this could be added to depends as well but not sure about : ## http://sourceforge.net/project/showfiles.php?group_id=132142 -depends=('kdepim>=3.5.7' 'kdebluetooth>=1.0_beta8-7') rodepends=('bluez-hcidump>=1.40' 'bluez-firmware') groups=('kde-extra') archs=('i686' 'x86_64') -#_F_berlios_ext=".tar.bz2" -_F_kde_defaults=0 -_F_kde_reconf=1 Finclude berlios kde +depends=("kdepim>=$_F_kde_ver" 'kdebluetooth') url="http://www.kmobiletools.org"; -source=(http://download.berlios.de/$pkgname/$pkgname-$(echo $pkgver|sed 's/_/-/')$_F_berlios_ext do_not_conflict_with_kdebluetooth.patch) -_F_cd_path="$pkgname-$(echo $pkgver|sed 's/_/-/')" -sha1sums=('06dc3ecc14b667cf0c67e597d9a1d78c78e92af5' \ - 'c44584bb81aa6576517f20c5fdfb78fc91b7e236') +up2date="Flasttar http://ftp.frugalware.org/pub/other/sources/$pkgname"; +source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2) +signatures=($source.asc) # optimization OK diff --git a/source/kde-extra/kmobiletools/do_not_conflict_with_kdebluetooth.patch b/source/kde-extra/kmobiletools/do_not_conflict_with_kdebluetooth.patch deleted file mode 100644 index e916676..000 --- a/source/kde-extra/kmobiletools/do_not_conflict_with_kdebluetooth.patch +++ /dev/null @@ -1,211 +0,0 @@ -diff -Naur kmobiletools-0.5.0-beta3/kmobiletools/configure.in.bot kmobiletools-0.5.0-beta3-p/kmobiletools/configure.in.bot kmobiletools-0.5.0-beta3/kmobiletools/configure.in.bot 2007-06-05 16:18:07.0 +0200 -+++ kmobiletools-0.5.0-beta3-p/kmobiletools/configure.in.bot 2007-09-23 16:18:24.0 +0200 -@@ -10,10 +10,10 @@ - - # kdebluetooth - KDEBLUETOOTH_VER=$DISABLED --if test x$have_kbluetooth = xyes; then -+if test "x$have_kbluetooth" = "xyes"; then - KDEBLUETOOTH_VER="1.0-beta2" - fi --if test x$have_new_kbluetooth = xyes; then -+if test "x$have_new_kbluetooth" = "xyes"; then - KDEBLUETOOTH_VER="with dbus integration" - fi - echo -e "KDEBluetooth Integration\t\t$KDEBLUETOOTH_VER" -@@ -44,7 +44,10 @@ - fi - - echo -e "\n*\n" --if test x$have_gammu != xyes; then -+if test "x$have_gammu" != "xyes"; then - echo -e "Please note that you need EXACTLY gammu (or libgammu) 1.10.6.\nIf your distribution has another version,\nread http://www.kmobiletools.org/gammu for more details." - fi - -+if test "x$have_new_kbluetooth" = "xyes" && test "x$have_obexftp" != "xyes"; then -+echo -e "ObexFTP Kioslave support was disabled since it seems you have installed KDEBluetooth 1.0-beta3 or upper version, which does provide exactly the same obexftp kioslave included in kmobiletools." -+fi -diff -Naur kmobiletools-0.5.0-beta3/kmobiletools/configure.in.in kmobiletools-0.5.0-beta3-p/kmobiletools/configure.in.in kmobiletools-0.5.0-beta3/kmobiletools/configure.in.in 2007-06-05 16:18:07.0 +0200 -+++ kmobiletools-0.5.0-beta3-p/kmobiletools/configure.in.in2007-09-23 16:18:24.0 +0200 -@@ -8,11 +8,11 @@ - # BEGIN KONTACT CHECK - ### - --AC_ARG_ENABLE(kontact, AC_HELP_STRING([--disable-kontact-plugin], [disable KMobileTools Kontact plugin (default: check)]), -+AC_ARG_ENABLE(kontact, AC_HELP_STRING([--disable-kontact], [disable KMobileTools Kontact plugin (default: check)]), - [enable_kontact=$enableval], [enable_kontact=yes]) --if test "$enable_kontact" = "yes"; then -+if test "x$enable_kontact" = "xyes"; then - KDE_CHECK_HEADER(kontact/plugin.h, [have_kontact="yes"], [have_kontact="no"]) -- if test "$have_kontact" = "yes"; then -+ if test "x$have_kontact" = "xyes"; then - AC_DEFINE(HAVE_KONTACT, 1, [have KONTACT]) - fi - fi -@@ -22,9 +22,9 @@ - AC_ARG_ENABLE(libkcal, AC_HELP_STRING([--disable-libkcal], [disable KMobileTools KCalendar support (default: check)]), - [enable_kcal=$enableval], [enable_kcal=yes]) - --if test "$enable_kcal" = "yes"; then -+if test "x$enable_kcal" = "xyes"; then - KDE_CHECK_HEADER(libkcal/event.h, [have_kcal="yes"], [have_kcal="no"]) -- if test "$have_kcal" = "yes"; then -+ if test "x$have_kcal" = "xyes"; then - AC_DEFINE(HAVE_KCAL, 1, [have KCAL]) - LIB_KCAL="-lkcal" - else -@@
[Frugalware-git] kdetesting: kiosktool-1072545-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=c12ef579fe32c7a09030012693da7938d9dae1b4 commit c12ef579fe32c7a09030012693da7938d9dae1b4 Author: Miklos Vajna Date: Wed Jan 20 01:55:37 2010 +0100 kiosktool-1072545-1-i686 - bump to kde4 snapshot diff --git a/source/kde-extra/kiosktool/FrugalBuild b/source/kde-extra/kiosktool/FrugalBuild index 23f0e3b..c563be4 100644 --- a/source/kde-extra/kiosktool/FrugalBuild +++ b/source/kde-extra/kiosktool/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Janos Kovacs pkgname=kiosktool -pkgver=1.0 -pkgrel=2 +pkgver=1072545 +pkgrel=1 pkgdesc="A graphical tool for system administrators to manage on a system wide level KDE usage restrictions (KIOSK features) and default settings" url="http://extragear.kde.org/apps/kiosktool/"; -depends=('kdelibs') groups=('kde-extra') archs=('i686' 'x86_64') Finclude kde -up2date="lynx -dump ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin/|grep $pkgname-[0-9\.]*\.tar.gz|tail -n 1|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin/$pkgname-$pkgver.tar.gz) -sha1sums=('63603c9c61ec48b7b35467694b0d93d4fc6fdb11') +depends=("kdelibs>=$_F_kde_ver" 'libqt3support') +up2date="Flasttar http://ftp.frugalware.org/pub/other/sources/$pkgname"; +source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2) +signatures=($source.asc) license="GPL" ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: qemu-0.12.1-2-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b93d1a14cde3b19ab28d0a2a9509fe7b4e4f8bc commit 9b93d1a14cde3b19ab28d0a2a9509fe7b4e4f8bc Author: Miklos Vajna Date: Wed Jan 20 01:40:48 2010 +0100 qemu-0.12.1-2-i686 - quote carch in case it's not set to avoid syntax errors diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index 3262638..4afa7eb 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -34,7 +34,7 @@ if Fuse $USE_DEVEL; then _F_scm_url="svn://svn.savannah.nongnu.org/qemu/trunk" Finclude scm fi -if [ $CARCH == "ppc" ]; then +if [ "$CARCH" == "ppc" ]; then Fconfopts="$Fconfopts --disable-kvm" fi ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: qemu-0.12.1-2-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dafbc77ecbc0133ae9b91ee0dd4dc495d517e9f6 commit dafbc77ecbc0133ae9b91ee0dd4dc495d517e9f6 Author: Miklos Vajna Date: Wed Jan 20 01:25:39 2010 +0100 qemu-0.12.1-2-i686 - add kqemu to replaces, it's dead diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild deleted file mode 100644 index bafebb9..000 --- a/source/xapps-extra/kqemu/FrugalBuild +++ /dev/null @@ -1,29 +0,0 @@ -# Compiling Time: 0.03 SBU -# Maintainer: Miklos Vajna - -pkgname=kqemu -pkgver=1.4.0pre1 -pkgrel=12 -pkgdesc="QEMU Accelerator Module" -url="http://www.nongnu.org/qemu/"; -depends=('qemu') -_F_kernelmod_scriptlet=$pkgname.install -Finclude kernel-module -groups=('xapps-extra') -archs=('i686' 'x86_64') -up2date="Flasttar $url/download.html" -source=($url/kqemu-$pkgver.tar.gz README.Frugalware) -sha1sums=('398f440829863f16c2d63065af1026d8eaa257c4' \ - 'e1eb29a8e4c453480a18857c4416d1cc979a28f4') - -build() -{ - Fsed '\(./install.sh\)' '#\1' Makefile - Fmake --kernel-path=$_F_kernelmod_dir/build - Ffilerel $_F_kernelmod_dir/misc/kqemu.ko - Fmkdir /etc/udev/rules.d/ - echo 'KERNEL=="kqemu*", NAME="%k", GROUP="users", MODE="0660"' \ - > $Fdestdir/etc/udev/rules.d/48-qemu.rules - Fdoc README.Frugalware - Fbuild_kernelmod_scriptlet -} diff --git a/source/xapps-extra/kqemu/README.Frugalware b/source/xapps-extra/kqemu/README.Frugalware deleted file mode 100644 index 04fe05e..000 --- a/source/xapps-extra/kqemu/README.Frugalware +++ /dev/null @@ -1,10 +0,0 @@ -If you want to use kqemu, you need to mount `tmpfs` on `/dev/shm`. This is not -problematic, `qemu` prints a usable error message if you miss that. The problem -is that you have to do this again and again after each reboot. If you hate -this, then just add the following line to your `/etc/fstab`: - - -tmpfs/dev/shm tmpfs defaults,size=144m 0 0 - - -// vim: ft=asciidoc diff --git a/source/xapps-extra/kqemu/kqemu.install b/source/xapps-extra/kqemu/kqemu.install deleted file mode 100644 index c054c92..000 --- a/source/xapps-extra/kqemu/kqemu.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() -{ - /sbin/depmod -a $_F_kernelmod_uname - /sbin/modprobe kqemu major=0 - if ! grep -q kqemu /etc/sysconfig/modules; then - echo 'kqemu "major=0"' >>/etc/sysconfig/modules - fi -} - -post_upgrade() -{ - post_install -} - -post_remove() -{ - /sbin/depmod -a $_F_kernelmod_uname - sed '/^kqemu/d' -i /etc/sysconfig/modules -} - -op=$1 -shift - -$op $* diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index 7d28650..3262638 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -6,12 +6,13 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=qemu pkgver=0.12.1 Fuse $USE_DEVEL && pkgver=svn6369 -pkgrel=1 +pkgrel=2 Fuse $USE_DEVEL && pkgrel=1 pkgdesc="QEMU is a FAST! processor emulator" url="http://www.nongnu.org/qemu/"; depends=('libx11' 'sdl' 'zlib' 'alsa-lib') makedepends=('texi2html') +replaces=('kqemu') groups=('xapps-extra') archs=('i686' 'x86_64' 'ppc') _F_archive_grepv="rc" ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: acetoneiso2-1.96_beta2-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=a434ba68bb6c79a00e9062652a195dc2daf19185 commit a434ba68bb6c79a00e9062652a195dc2daf19185 Author: Miklos Vajna Date: Wed Jan 20 00:45:35 2010 +0100 acetoneiso2-1.96_beta2-1-i686 - add kiso to replaces() diff --git a/source/kde-extra/acetoneiso2/FrugalBuild b/source/kde-extra/acetoneiso2/FrugalBuild index e02945c..9013f41 100644 --- a/source/kde-extra/acetoneiso2/FrugalBuild +++ b/source/kde-extra/acetoneiso2/FrugalBuild @@ -10,7 +10,7 @@ rodepends=('7zip' 'cdrdao' 'cdrtools' 'gpg-agent' 'gnupg' \ 'fuseiso' 'kdebase-runtime' 'pinentry-qt' 'coreutils' 'dvd+rw-tools') groups=('kde-extra') archs=('i686' 'x86_64') -replaces=('kcdemu') +replaces=('kcdemu' 'kiso') _F_sourceforge_sep="_" Finclude sourceforge up2date="lynx -dump 'http://www.acetoneteam.org/download.html'|grep -m1 'LATEST VERSION'|sed 's/.*].*SO2 v\(.*\)/\1/;s/ /_/'" diff --git a/source/kde-extra/kiso/FrugalBuild b/source/kde-extra/kiso/FrugalBuild deleted file mode 100644 index 8f19045..000 --- a/source/kde-extra/kiso/FrugalBuild +++ /dev/null @@ -1,19 +0,0 @@ -# Compiling Time: 0.26 SBU -# Maintainer: Miklos Vajna - -pkgname=kiso -pkgver=0.8.3 -pkgrel=3 -pkgdesc="To make creating, extracting and editing of ISO-Images as easy as possible." -Finclude sourceforge -url="http://kiso.sourceforge.net/"; -depends=('libcdio>=0.81-1' 'kdelibs') -groups=('kde-extra') -archs=('i686' 'x86_64') -options=('scriptlet') -up2date="lynx -dump $url/download.php|grep tar.bz2|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=($source kiso-0.8.3-libcdio-077.patch) -sha1sums=('52001f902a96d425a8164fe172a2bf80a5db7fda' \ - '866367cfaf849b125d6d3c660c406ce237d32603') - -# optimization OK diff --git a/source/kde-extra/kiso/kiso-0.8.3-libcdio-077.patch b/source/kde-extra/kiso/kiso-0.8.3-libcdio-077.patch deleted file mode 100644 index 0d04677..000 --- a/source/kde-extra/kiso/kiso-0.8.3-libcdio-077.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: kiso-0.8.3/src/kiso.cpp -=== kiso-0.8.3.orig/src/kiso.cpp -+++ kiso-0.8.3/src/kiso.cpp -@@ -43,6 +43,11 @@ - - #define DEFAULT_TIMEOUT_MS 1 - -+#if LIBCDIO_VERSION_NUM < 77 -+#define mmc_csb_t scsi_mmc_t -+#define mmc_run_cmd scsi_run_cmd -+#endif -+ - static const char* const image2_data[] = { - "32 32 41 1", - ". c None", -@@ -3591,14 +3596,14 @@ void Mainform::showdrive() - - int i_status; - uint8_t buf[500] = { 0, }; --scsi_mmc_cdb_t cdb = {{0, }}; -+mmc_cdb_t cdb = {{0, }}; - - CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION); - CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf)); - cdb.field[1] = CDIO_MMC_GET_CONF_ALL_FEATURES; - cdb.field[3] = 0x0; - --i_status = scsi_mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf), &buf); -+i_status = mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf), &buf); - if (i_status == 0) { - uint8_t *p; - uint32_t i_data; ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: Revert "acetoneiso-2.2.1-1-i686"
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=20dfb678303375c4f2d5bad32d3d11e4c41396ea commit 20dfb678303375c4f2d5bad32d3d11e4c41396ea Author: Miklos Vajna Date: Wed Jan 20 00:44:47 2010 +0100 Revert "acetoneiso-2.2.1-1-i686" This reverts commit 64f0f5050b4b12280366bc85640eadc4fa25eabb. Whoops, we have this package already as acetoniso2. diff --git a/source/kde-extra/acetoneiso/FrugalBuild b/source/kde-extra/acetoneiso/FrugalBuild deleted file mode 100644 index c36607c..000 --- a/source/kde-extra/acetoneiso/FrugalBuild +++ /dev/null @@ -1,24 +0,0 @@ -# Compiling Time: 0.43 SBU -# Maintainer: Miklos Vajna - -pkgname=acetoneiso -pkgver=2.2.1 -pkgrel=1 -pkgdesc="A feature-rich and complete software application to manage CD/DVD images." -_F_sourceforge_sep="_" -Finclude sourceforge -url="http://www.acetoneteam.org/"; -depends=('libqtcore' 'libqtgui' 'libqtwebkit' 'libqtscript' 'libqtphonon') -groups=('kde-extra') -replaces=('kiso') -archs=('i686') -sha1sums=('9e3520afc759c855fe040b0310245f23874f704a') - -build() -{ - Fcd ${pkgname}_$pkgver/$pkgname - qmake || Fdie - unset MAKEFLAGS - make || Fdie - Fmakeinstall INSTALL_ROOT=$Fdestdir -} diff --git a/source/kde-extra/kiso/FrugalBuild b/source/kde-extra/kiso/FrugalBuild new file mode 100644 index 000..8f19045 --- /dev/null +++ b/source/kde-extra/kiso/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.26 SBU +# Maintainer: Miklos Vajna + +pkgname=kiso +pkgver=0.8.3 +pkgrel=3 +pkgdesc="To make creating, extracting and editing of ISO-Images as easy as possible." +Finclude sourceforge +url="http://kiso.sourceforge.net/"; +depends=('libcdio>=0.81-1' 'kdelibs') +groups=('kde-extra') +archs=('i686' 'x86_64') +options=('scriptlet') +up2date="lynx -dump $url/download.php|grep tar.bz2|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" +source=($source kiso-0.8.3-libcdio-077.patch) +sha1sums=('52001f902a96d425a8164fe172a2bf80a5db7fda' \ + '866367cfaf849b125d6d3c660c406ce237d32603') + +# optimization OK diff --git a/source/kde-extra/kiso/kiso-0.8.3-libcdio-077.patch b/source/kde-extra/kiso/kiso-0.8.3-libcdio-077.patch new file mode 100644 index 000..0d04677 --- /dev/null +++ b/source/kde-extra/kiso/kiso-0.8.3-libcdio-077.patch @@ -0,0 +1,33 @@ +Index: kiso-0.8.3/src/kiso.cpp +=== +--- kiso-0.8.3.orig/src/kiso.cpp kiso-0.8.3/src/kiso.cpp +@@ -43,6 +43,11 @@ + + #define DEFAULT_TIMEOUT_MS 1 + ++#if LIBCDIO_VERSION_NUM < 77 ++#define mmc_csb_t scsi_mmc_t ++#define mmc_run_cmd scsi_run_cmd ++#endif ++ + static const char* const image2_data[] = { + "32 32 41 1", + ". c None", +@@ -3591,14 +3596,14 @@ void Mainform::showdrive() + + int i_status; + uint8_t buf[500] = { 0, }; +-scsi_mmc_cdb_t cdb = {{0, }}; ++mmc_cdb_t cdb = {{0, }}; + + CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION); + CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf)); + cdb.field[1] = CDIO_MMC_GET_CONF_ALL_FEATURES; + cdb.field[3] = 0x0; + +-i_status = scsi_mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf), &buf); ++i_status = mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf), &buf); + if (i_status == 0) { + uint8_t *p; + uint32_t i_data; ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: check if entry is not empty (add custom mirror dialogbox)
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=185ba32fdbd34136a461f568ee435ed59f548a27 commit 185ba32fdbd34136a461f568ee435ed59f548a27 Author: Elentir Date: Tue Jan 19 23:00:40 2010 +0100 configsource: check if entry is not empty (add custom mirror dialogbox) diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 708fff5..7aa5d58 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -184,7 +184,7 @@ void add_mirror (GtkWidget *button, gpointer data) sName = fwife_entry(_("Add a custom server"), _("You may specify a custom mirror (eg. LAN) so you can download packages faster.\nEnter server's address below :") , NULL); - if(sName) { + if(sName && strcmp(sName, "")) { gtk_list_store_append (GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE (model), &iter, COLUMN_USE, TRUE, COLUMN_NAME, sName, COLUMN_FROM, "CUSTOM", -1); ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: change order of two columns in main widget
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=82f2eb79a849a5bd52a3e340c677313b14c979a0 commit 82f2eb79a849a5bd52a3e340c677313b14c979a0 Author: Elentir Date: Tue Jan 19 22:57:04 2010 +0100 configsource: change order of two columns in main widget diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 6d26b26..708fff5 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -60,8 +60,8 @@ int is_connected(char *host, int port, int timeouttime); enum { - COLUMN_STATUS, COLUMN_USE, + COLUMN_STATUS, COLUMN_NAME, COLUMN_FROM, NUM_COLUMNS @@ -231,21 +231,21 @@ GtkWidget *mirrorview() GtkCellRenderer *renderer; GtkWidget *view; - store = gtk_list_store_new(NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING); + store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); model = GTK_TREE_MODEL(store); view = gtk_tree_view_new_with_model(model); g_object_unref (store); - renderer = gtk_cell_renderer_pixbuf_new(); - col = gtk_tree_view_column_new_with_attributes (_("Status"), renderer, "pixbuf", COLUMN_STATUS, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); - renderer = gtk_cell_renderer_toggle_new (); g_signal_connect (renderer, "toggled", G_CALLBACK (fixed_toggled), model); col = gtk_tree_view_column_new_with_attributes (_("Use"), renderer, "active", COLUMN_USE, NULL); gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (col), GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (col), 50); gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); + + renderer = gtk_cell_renderer_pixbuf_new(); + col = gtk_tree_view_column_new_with_attributes (_("Status"), renderer, "pixbuf", COLUMN_STATUS, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); renderer = gtk_cell_renderer_text_new(); col = gtk_tree_view_column_new_with_attributes (_("Mirrors"), renderer, "text", COLUMN_NAME, NULL); @@ -334,16 +334,16 @@ int prerun(GList **config) if(is_connected(testurl, 80, 1) < 1) { gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(viewserver))), &iter, - COLUMN_STATUS, pixbad, - COLUMN_USE, (gboolean)(GPOINTER_TO_INT(g_list_nth_data(mirrorlist, i+2))), - COLUMN_NAME, (gchar*)g_list_nth_data(mirrorlist, i), - COLUMN_FROM, (gchar*)g_list_nth_data(mirrorlist, i+1), -1); + COLUMN_USE, (gboolean)(GPOINTER_TO_INT(g_list_nth_data(mirrorlist, i+2))), + COLUMN_STATUS, pixbad, + COLUMN_NAME, (gchar*)g_list_nth_data(mirrorlist, i), + COLUMN_FROM, (gchar*)g_list_nth_data(mirrorlist, i+1), -1); } else { gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(viewserver))), &iter, - COLUMN_STATUS, pixgood, - COLUMN_USE, (gboolean)(GPOINTER_TO_INT(g_list_nth_data(mirrorlist, i+2))), - COLUMN_NAME, (gchar*)g_list_nth_data(mirrorlist, i), - COLUMN_FROM, (gchar*)g_list_nth_data(mirrorlist, i+1), -1); + COLUMN_USE, (gboolean)(GPOINTER_TO_INT(g_list_nth_data(mirrorlist, i+2))), + COLUMN_STATUS, pixgood, + COLUMN_NAME, (gchar*)g_list_nth_data(mirrorlist, i), + COLUMN_FROM, (gchar*)g_list_nth_data(mirrorlist, i+1), -1); } free(testurl); } ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gnome-mount-0.8-2-i686 *fixing hal locking when device is in fstab
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=220f1c1231d426de38d2fc6ca388ce09a89492c3 commit 220f1c1231d426de38d2fc6ca388ce09a89492c3 Author: bouleetbil Date: Tue Jan 19 21:45:12 2010 + gnome-mount-0.8-2-i686 *fixing hal locking when device is in fstab diff --git a/source/gnome/gnome-mount/FrugalBuild b/source/gnome/gnome-mount/FrugalBuild index e97cf53..ef88b34 100644 --- a/source/gnome/gnome-mount/FrugalBuild +++ b/source/gnome/gnome-mount/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-mount pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc="Programs for mounting, unmounting and ejecting storage devices." url="http://www.gnome.org"; depends=('gtk+2>=2.16.2-2' 'gnome-keyring>=2.28.0' 'hal>=0.5.9' 'libbonobo' 'libnotify>=0.4.5-2') @@ -11,12 +11,13 @@ makedepends=('perl-xml-parser' 'intltool' 'nautilus>=2.28.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ - gnome-mount-0.6-default-mount-options.patch) + gnome-mount-0.6-default-mount-options.patch fstablock.diff) up2date="Flasttar http://hal.freedesktop.org/releases/"; _F_gnome_schemas=('/etc/gconf/schemas/gnome-mount.schemas') Finclude gnome-scriptlet sha1sums=('846ba178cf9009f3e32c7f55f912b3ca6b9ecedb' \ - 'f5e2d09503c12b61f33f54969256189eee2111b4') + 'f5e2d09503c12b61f33f54969256189eee2111b4' \ + '90248972a943b26d4ac9520faee99513dabbdb64') Fconfopts="$Fconfopts --enable-nautilus-extension" subpkgs=('gnome-mount-nautilus') diff --git a/source/gnome/gnome-mount/fstablock.diff b/source/gnome/gnome-mount/fstablock.diff new file mode 100644 index 000..c7254e0 --- /dev/null +++ b/source/gnome/gnome-mount/fstablock.diff @@ -0,0 +1,60 @@ +diff -p -up gnome-mount-0.8/src/gnome-mount.c.lock gnome-mount-0.8/src/gnome-mount.c +--- gnome-mount-0.8/src/gnome-mount.c.lock 2008-09-15 14:39:28.0 +0200 gnome-mount-0.8/src/gnome-mount.c 2008-09-15 14:42:54.0 +0200 +@@ -1166,6 +1166,18 @@ volume_mount (const char *udi, LibHalVol + char *args[3] = {MOUNT, NULL, NULL}; + char **envp = {NULL}; + ++ /* don't mount if device is locked ++ */ ++if (libhal_device_is_locked_by_others (hal_ctx, ++ udi, ++ "org.freedesktop.Hal.Device.Storage", ++ NULL)) { ++if (opt_verbose) ++g_message (_("Device %s is locked, aborting"), ++ udi); ++goto out; ++} ++ + if (opt_verbose) + g_print (_("Device %s is in /etc/fstab with mount point \"%s\"\n"), + device_file, mount_point_fstab); +@@ -1738,6 +1750,17 @@ volume_unmount (const char *udi, LibHalV + char *args[3] = {UMOUNT, NULL, NULL}; + char **envp = {NULL}; + ++ /* don't unmount if device is locked ++ */ ++if (libhal_device_is_locked_by_others (hal_ctx, ++ udi, ++ "org.freedesktop.Hal.Device.Storage", ++ NULL)) { ++if (opt_verbose) ++g_message (_("Device %s is locked, aborting"), ++ udi); ++goto out; ++} + if (opt_verbose) + g_print (_("Device %s is in /etc/fstab with mount point \"%s\"\n"), + device_file, mount_point); +@@ -1958,6 +1981,18 @@ volume_eject (const char *udi, LibHalVol + char *args[3] = {"eject", NULL, NULL}; + char **envp = {NULL}; + ++ /* don't mount if device is locked ++ */ ++if (libhal_device_is_locked_by_others (hal_ctx, ++ udi, ++ "org.freedesktop.Hal.Device.Storage", ++ NULL)) { ++if (opt_verbose) ++g_message (_("Device %s is locked, aborting"), ++ udi); ++
[Frugalware-git] frugalware-current: gnome-policykit-0.9.2-2-i686 *added some fix for works well *without gnome user can't change the rules
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4185f6ab7a02eb3b503758c1c4e3f577535583bc commit 4185f6ab7a02eb3b503758c1c4e3f577535583bc Author: bouleetbil Date: Tue Jan 19 21:28:28 2010 + gnome-policykit-0.9.2-2-i686 *added some fix for works well *without gnome user can't change the rules diff --git a/source/gnome/gnome-policykit/FixClick.diff b/source/gnome/gnome-policykit/FixClick.diff new file mode 100644 index 000..be48582 --- /dev/null +++ b/source/gnome/gnome-policykit/FixClick.diff @@ -0,0 +1,12 @@ +--- ./polkit-gnome/polkit-gnome-action.c.old 2009-02-06 17:31:46.0 + ./polkit-gnome/polkit-gnome-action.c 2009-02-06 17:32:03.0 + +@@ -2062,6 +2062,8 @@ _button_clicked (GtkButton *button, PolK + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS: + /* g_debug ("blocking clicked"); */ + g_signal_stop_emission_by_name (button, "clicked"); ++if (action->priv->polkit_action != NULL) ++g_signal_emit (action, signals [AUTH_START_SIGNAL], 0); + break; + + default: + diff --git a/source/gnome/gnome-policykit/FixDbus.diff b/source/gnome/gnome-policykit/FixDbus.diff new file mode 100644 index 000..0360c7c --- /dev/null +++ b/source/gnome/gnome-policykit/FixDbus.diff @@ -0,0 +1,15 @@ +diff -up PolicyKit-gnome-0.9.2/src/polkit-gnome-manager.c.reregister PolicyKit-gnome-0.9.2/src/polkit-gnome-manager.c +--- PolicyKit-gnome-0.9.2/src/polkit-gnome-manager.c.reregister 2008-07-22 18:00:53.0 +0100 PolicyKit-gnome-0.9.2/src/polkit-gnome-manager.c 2009-08-13 12:28:15.534034826 +0100 +@@ -287,10 +287,6 @@ register_manager (PolKitGnomeManager *ma + } + + dbus_g_connection_register_g_object (manager->priv->session_bus_connection, +- "/org/gnome/PolicyKit/Manager", +- G_OBJECT (manager)); +- +-dbus_g_connection_register_g_object (manager->priv->session_bus_connection, + "/", + G_OBJECT (manager)); + + diff --git a/source/gnome/gnome-policykit/FrugalBuild b/source/gnome/gnome-policykit/FrugalBuild index 1b92321..1098339 100644 --- a/source/gnome/gnome-policykit/FrugalBuild +++ b/source/gnome/gnome-policykit/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gnome-policykit _F_archive_name=PolicyKit-gnome pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="PolicyKit policies and configurations for the GNOME desktop" url="http://hal.freedesktop.org/docs/PolicyKit"; depends=('policykit' 'gconf' 'gtk+2') @@ -12,8 +12,11 @@ makedepends=('intltool' 'gnome-doc-utils') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://hal.freedesktop.org/releases/"; -source=(http://hal.freedesktop.org/releases/$_F_archive_name-$pkgver.tar.bz2) -sha1sums=('2af77fad1ca2e9a4e5fce204960b9ba74cf59a8d') +source=(http://hal.freedesktop.org/releases/$_F_archive_name-$pkgver.tar.bz2 FixClick.diff FixDbus.diff) +sha1sums=('2af77fad1ca2e9a4e5fce204960b9ba74cf59a8d' \ + 'b687b35eca870135d518502fce6a997e28d34464' \ + '34fb525607bb2ea2002fb23e1872114fe9b8e0cf') + Fconfopts="${fconfop...@]} --disable-gtk-doc" _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/polkit-gnome.schemas') ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: fix warning
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=ec08ed28a8b5fcd3f0bd87bcd14e7cc19b523fb6 commit ec08ed28a8b5fcd3f0bd87bcd14e7cc19b523fb6 Author: Elentir Date: Tue Jan 19 20:01:51 2010 +0100 configsource: fix warning diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index c04659b..6d26b26 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -1124,7 +1124,7 @@ int run_net_config(GList **config) { case GTK_RESPONSE_YES: free(newprofile); - if(newprofile = fwnet_parseprofile(lastprof) != NULL) { + if((newprofile = fwnet_parseprofile(lastprof)) != NULL) { sprintf(newprofile->name, "default"); data_put(config, "netprofile", newprofile); free(ptr); ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: use fw_system instead of fw_system_interactive for netconfig
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=323c0c8a08efe5a85305538f21f9b86015fabfaf commit 323c0c8a08efe5a85305538f21f9b86015fabfaf Author: Elentir Date: Tue Jan 19 19:56:45 2010 +0100 configsource: use fw_system instead of fw_system_interactive for netconfig diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 012c9ad..c04659b 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -995,7 +995,7 @@ int post_net_config(fwnet_profile_t *newprofile, fwnet_interface_t *interface) char *host = strdup("frugalware"); fwnet_writeconfig(newprofile, host); - fw_system_interactive("netconfig start"); + fw_system("netconfig start"); free(host); if(is_connected("www.google.org", 80, 5) < 1) { @@ -1003,7 +1003,7 @@ int post_net_config(fwnet_profile_t *newprofile, fwnet_interface_t *interface) if(ret == GTK_RESPONSE_YES) { return 0; } else { - fw_system_interactive("netconfig stop"); + fw_system("netconfig stop"); return -1; } } ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: infer connection type when an active connection is found
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=90660e77129fedc95be49bf316de99ca7f0e7885 commit 90660e77129fedc95be49bf316de99ca7f0e7885 Author: Elentir Date: Tue Jan 19 19:52:21 2010 +0100 configsource: infer connection type when an active connection is found diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 8abbc5a..012c9ad 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -314,18 +314,9 @@ int prerun(GList **config) GtkTreeIter iter; char *fn, *testurl; int i; - - if(is_connected("www.google.com", 80, 2) < 1) { - switch(fwife_question(_("You need an active internet connection ,\n do you want to configure your network now?"))) - { - case GTK_RESPONSE_YES: - while(run_net_config(config) == -1) {} - break; - case GTK_RESPONSE_NO: - break; - } - } - + + while(run_net_config(config) == -1) {} + if(mirrorlist == NULL) { fn = g_strdup_printf("%s/%s", PACCONFPATH, PACCONF); mirrorlist = getmirrors(fn); @@ -1107,10 +1098,13 @@ int run_net_config(GList **config) { char *nettype = NULL; char *ptr = NULL; + char *lastprof = NULL; fwnet_interface_t *newinterface = NULL; + struct dirent *ent = NULL; + DIR *dir; /* profile used do write configuration */ - fwnet_profile_t *newprofile=NULL; + fwnet_profile_t *newprofile = NULL; if((newprofile = (fwnet_profile_t*)malloc(sizeof(fwnet_profile_t))) == NULL) return 1; @@ -1120,6 +1114,54 @@ int run_net_config(GList **config) return 1; memset(newinterface, 0, sizeof(fwnet_interface_t)); + if(is_connected("www.google.com", 80, 2) == 1) { + // seems we got a connection, can we infer the origin? + // installation from fw? in this case we've got a netconfig profile + lastprof = fwnet_lastprofile(); + if(lastprof != NULL) { + ptr = g_strdup_printf(_("A netconfig profile (\"%s\") seems to have been found from your current installation.\nDo you want to use it?"), lastprof); + switch(fwife_question(ptr)) + { + case GTK_RESPONSE_YES: + free(newprofile); + if(newprofile = fwnet_parseprofile(lastprof) != NULL) { + sprintf(newprofile->name, "default"); + data_put(config, "netprofile", newprofile); + free(ptr); + free(lastprof); + return 0; + } + case GTK_RESPONSE_NO: + break; + } + free(ptr); + free(lastprof); + } + + // maybe a dhcp connection without netconfig, look at generated resolv.conf + dir=opendir("/var/run/dhcpcd/resolv.conf/"); + while((ent = readdir(dir))) { + if(strcmp(ent->d_name, ".") && strcmp(ent->d_name, "..")) { + ptr = g_strdup_printf(_("An active connection seems to have been found on interface %s using dhcp.\nDo you want to use it?"), ent->d_name); + switch(fwife_question(ptr)) + { + case GTK_RESPONSE_YES: + newinterface->dhcp_opts[0]='\0'; + newinterface->options = g_list_append(newinterface->options, strdup("dhcp")); + sprintf(newprofile->name, "default"); + newprofile->interfaces = g_list_append(newprofile->interfaces, newinterface); + data_put(config, "netprofile", newprofile); + free(ptr); + return 0; + case GTK_RESPONSE_NO: + break; + } + free(ptr); + } + } + closedir(dir); + } + if(select_interface(newinterface) == -1) return 0; ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: * removing gtk+2-engine-excelsior
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b37dedd67a26110ea8b271da833a37c82f2ddb86 commit b37dedd67a26110ea8b271da833a37c82f2ddb86 Author: Devil505 Date: Tue Jan 19 18:00:05 2010 +0100 * removing gtk+2-engine-excelsior diff --git a/source/gnome-extra/gtk+2-engine-excelsior/FrugalBuild b/source/gnome-extra/gtk+2-engine-excelsior/FrugalBuild deleted file mode 100644 index 3c68ab9..000 --- a/source/gnome-extra/gtk+2-engine-excelsior/FrugalBuild +++ /dev/null @@ -1,20 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: Devil505 - -pkgname=gtk+2-engine-excelsior -pkgver=4.1.0 -pkgrel=2 -pkgdesc="A Theme Engine based on Clearlooks." -url="http://www.nanolx.org/index.php"; -depends=('gtk+2>=2.16.2-2' 'glibc' 'libxau>=1.0.4' 'libxdmcp' 'libxml2' 'freetype2' 'libxdamage' 'libxext') -options=('scriptlet') -groups=('gnome-extra') -archs=('i686' 'x86_64') -_F_archive_name="excelsior" -up2date="lynx -dump http://www.nanolx.org/free/ | Flasttar" -source=(http://www.nanolx.org/free/$_F_archive_name-$pkgver.tar.bz2) -_F_cd_path="$_F_archive_name" -sha1sums=('867dce7d64376b991915aac034a218b4c0c0f3b3') - -# optimization OK - ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gtk+2-engines-terranova-0.40-1-i686 * new package * replacing gtk+2-engine-excelsior
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=87694087374108e3fc3dd054ebc6bb0d3088bbdb commit 87694087374108e3fc3dd054ebc6bb0d3088bbdb Author: Devil505 Date: Tue Jan 19 17:59:43 2010 +0100 gtk+2-engines-terranova-0.40-1-i686 * new package * replacing gtk+2-engine-excelsior diff --git a/source/gnome-extra/gtk+2-engines-terranova/FrugalBuild b/source/gnome-extra/gtk+2-engines-terranova/FrugalBuild new file mode 100644 index 000..869bcbf --- /dev/null +++ b/source/gnome-extra/gtk+2-engines-terranova/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=gtk+2-engines-terranova +pkgver=0.40 +pkgrel=1 +pkgdesc="A highly customizable engine." +url="http://www.nanolx.org/home/item/76-terranova"; +depends=('gtk+2' 'libxau' 'libxdmcp' 'libxext' 'libstdc++' 'libxdamage' 'libxml2') +options=('scriptlet') +groups=('gnome-extra') +archs=('i686' 'x86_64') +_F_archive_name="TerraNova" +up2date="Flasttar $url" +source=(http://www.nanolx.org/free/TerraNova-$pkgver.tar.bz2) +_F_cd_path="$_F_archive_name" +sha1sums=('64995396646ee87f5d5dc8cf781ba7d66b788375') +replaces=('gtk+2-engine-excelsior') + +# optimization OK ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: kmenu-gnome-1.2.1-1-x86_64 * Version bump
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=ee148a124e367794ac45d09611da7ccde1868f3e commit ee148a124e367794ac45d09611da7ccde1868f3e Author: crazy Date: Tue Jan 19 17:35:12 2010 +0100 kmenu-gnome-1.2.1-1-x86_64 * Version bump diff --git a/source/kde-extra/kmenu-gnome/FrugalBuild b/source/kde-extra/kmenu-gnome/FrugalBuild index 66154ed..63ff1f3 100644 --- a/source/kde-extra/kmenu-gnome/FrugalBuild +++ b/source/kde-extra/kmenu-gnome/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kmenu-gnome -pkgver=1.0.1 +pkgver=1.2.1 pkgrel=1 pkgdesc="K Menu with Gnome folder and extra icons." _F_kde_defaults=0 @@ -14,7 +14,7 @@ rodepends=('kdelibs>=4.3.4') groups=('kde-extra') archs=('i686' 'x86_64') source=(http://www.kde-apps.org/CONTENT/content-files/31025-$pkgname-$pkgver.tar.gz) -sha1sums=('3bc5a53ce0598e7bb5b36be734558d42c93a6a98') +sha1sums=('f034d6adde49b8b2c732144bcb096065a2c808a5') build() { ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: kdebase-workspace-4.3.4-8-x86_64 * fixed cursors location * I wonder noone noticed =)
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=1f251676aa8184acbf15a89e2a23654acd9b76c1 commit 1f251676aa8184acbf15a89e2a23654acd9b76c1 Author: crazy Date: Tue Jan 19 17:25:26 2010 +0100 kdebase-workspace-4.3.4-8-x86_64 * fixed cursors location * I wonder noone noticed =) diff --git a/source/kde/kdebase-workspace/FrugalBuild b/source/kde/kdebase-workspace/FrugalBuild index a45ccb5..072ad4e 100644 --- a/source/kde/kdebase-workspace/FrugalBuild +++ b/source/kde/kdebase-workspace/FrugalBuild @@ -56,6 +56,11 @@ build() ## kdmrc should be in kde-fw package ( need to finish some kde-fw package first ) Fmv /etc/kde/config/kdm/kdmrc /etc/kde/config/kdm/kdmrc-kde4-$pkgver.orig + ## cursors location is broken so is the icon location broke + ## in oxygen-icons package ;) + Fmkdir usr/share/icons + Fmv /usr/share/kde/icons/Oxygen_* /usr/share/icons/ + } # optimization OK ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: frugalware-cursor-theme-1.2-2-i686 * moving from xlib-extra to xlib
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5043b9bf43c0218d088dfd2235ee68d5993f6991 commit 5043b9bf43c0218d088dfd2235ee68d5993f6991 Author: Devil505 Date: Tue Jan 19 14:28:03 2010 +0100 frugalware-cursor-theme-1.2-2-i686 * moving from xlib-extra to xlib diff --git a/source/xlib/frugalware-cursor-theme/FrugalBuild b/source/xlib/frugalware-cursor-theme/FrugalBuild new file mode 100644 index 000..9907137 --- /dev/null +++ b/source/xlib/frugalware-cursor-theme/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0 SBU +# Maintainer: Devil505 + +pkgname=frugalware-cursor-theme +pkgver=1.2 +pkgrel=2 +pkgdesc="Frugalware X11 cursor theme" +url="http://ftp.frugalware.org/pub/other/artwork/$pkgname"; +depends=() +groups=('xlib') +archs=('i686' 'x86_64' 'ppc') +up2date="Flasttar $url" +source=($url/$pkgname-$pkgver.tar.bz2) +sha1sums=('02f2b886a48a82db53062986f64ad6933127d24e') +replaces=('frugalware-gnome-cursor-theme') + +build() { + Fmkdir usr/share/icons + Fcp $pkgname-$pkgver/FwX11MouseThemeFading usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeSpinning24px usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeFading24px usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeSpinningFading usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeSpinning usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeSpinningFading24px usr/share/icons/ +} ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gnome-frugalware-1.2-2-i686 * fixing depends
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f805a3479863041981f6cae9ff20f16db9cc8f4 commit 4f805a3479863041981f6cae9ff20f16db9cc8f4 Author: Devil505 Date: Tue Jan 19 14:19:38 2010 +0100 gnome-frugalware-1.2-2-i686 * fixing depends diff --git a/source/gnome/gnome-frugalware/FrugalBuild b/source/gnome/gnome-frugalware/FrugalBuild index 8d4854f..1fa6791 100644 --- a/source/gnome/gnome-frugalware/FrugalBuild +++ b/source/gnome/gnome-frugalware/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gnome-frugalware pkgver=1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome default theme for Frugalware Linux." url="http://frugalware.org"; rodepends=('gnome-themes' 'gtk+2-engines>=2.16.1' 'dejavu-ttf' "gtk+2-theme-frugalware=$pkgver") @@ -18,7 +18,7 @@ install=gnome-frugalware.install subpkgs=('gtk+2-theme-frugalware') subdescs=('Frugalware GTK+2 theme') subdepends=('gtk+2-engines>=2.16.1') -subrodepends=('gtk+2-theme-shiki-colors frugalware-gnome-icon-theme frugalware-gnome-cursor-theme') +subrodepends=('gtk+2-theme-shiki-colors frugalware-gnome-icon-theme frugalware-cursor-theme') subgroups=('gnome') subarchs=('i686 x86_64 ppc') ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: * removing frugalware-gnome-cursor-theme
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b5d1f035a44fceb6024c4edb82d5e2a95a0f10f commit 5b5d1f035a44fceb6024c4edb82d5e2a95a0f10f Author: Devil505 Date: Tue Jan 19 14:17:20 2010 +0100 * removing frugalware-gnome-cursor-theme diff --git a/source/gnome/frugalware-gnome-cursor-theme/FrugalBuild b/source/gnome/frugalware-gnome-cursor-theme/FrugalBuild deleted file mode 100644 index 40ba3bc..000 --- a/source/gnome/frugalware-gnome-cursor-theme/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: Devil505 - -pkgname=frugalware-gnome-cursor-theme -pkgver=1.2 -pkgrel=1 -pkgdesc="Frugalware Gnome cursor theme" -url="http://ftp.frugalware.org/pub/other/artwork/$pkgname"; -depends=() -groups=('gnome') -archs=('i686' 'x86_64' 'ppc') -up2date="Flasttar $url" -source=($url/$pkgname-$pkgver.tar.bz2) -sha1sums=('424f2276f24bbb730a2c0f7a7ee1ba4282f8f232') - -build() { - Fmkdir usr/share/icons - Fcp $pkgname-$pkgver/FwX11MouseThemeFading usr/share/icons/ - Fcp $pkgname-$pkgver/FwX11MouseThemeSpinning24px usr/share/icons/ - Fcp $pkgname-$pkgver/FwX11MouseThemeFading24px usr/share/icons/ - Fcp $pkgname-$pkgver/FwX11MouseThemeSpinningFading usr/share/icons/ - Fcp $pkgname-$pkgver/FwX11MouseThemeSpinning usr/share/icons/ - Fcp $pkgname-$pkgver/FwX11MouseThemeSpinningFading24px usr/share/icons/ -} - ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: frugalware-cursor-theme-1.2-1-i686 * new package * replaces frugalware-gnome-cursor-theme
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=27d2f2cb4ac4393f1cf86fdf8f829f96c9c25be8 commit 27d2f2cb4ac4393f1cf86fdf8f829f96c9c25be8 Author: Devil505 Date: Tue Jan 19 14:16:01 2010 +0100 frugalware-cursor-theme-1.2-1-i686 * new package * replaces frugalware-gnome-cursor-theme diff --git a/source/xlib-extra/frugalware-cursor-theme/FrugalBuild b/source/xlib-extra/frugalware-cursor-theme/FrugalBuild new file mode 100644 index 000..6712537 --- /dev/null +++ b/source/xlib-extra/frugalware-cursor-theme/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0 SBU +# Maintainer: Devil505 + +pkgname=frugalware-cursor-theme +pkgver=1.2 +pkgrel=1 +pkgdesc="Frugalware X11 cursor theme" +url="http://ftp.frugalware.org/pub/other/artwork/$pkgname"; +depends=() +groups=('xlib-extra') +archs=('i686' 'x86_64' 'ppc') +up2date="Flasttar $url" +source=($url/$pkgname-$pkgver.tar.bz2) +sha1sums=('02f2b886a48a82db53062986f64ad6933127d24e') +replaces=('frugalware-gnome-cursor-theme') + +build() { + Fmkdir usr/share/icons + Fcp $pkgname-$pkgver/FwX11MouseThemeFading usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeSpinning24px usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeFading24px usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeSpinningFading usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeSpinning usr/share/icons/ + Fcp $pkgname-$pkgver/FwX11MouseThemeSpinningFading24px usr/share/icons/ +} + ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: kdelibs-4.3.4-1-x86_64 * added default font patch * not yet bumped
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=17aa1996eed587202e9750e78bb491170c9e5aa2 commit 17aa1996eed587202e9750e78bb491170c9e5aa2 Author: crazy Date: Tue Jan 19 12:01:02 2010 +0100 kdelibs-4.3.4-1-x86_64 * added default font patch * not yet bumped diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild index a2e66ea..f09bd40 100644 --- a/source/kde/kdelibs/FrugalBuild +++ b/source/kde/kdelibs/FrugalBuild @@ -10,7 +10,7 @@ depends=('libpng' 'libxrandr' 'libxinerama' 'libqtsvg' 'strigi' 'libxft' \ 'pcre' 'libqttest>=4.4.0' 'libxslt' 'heimdal' 'libqtsql>=4.4.0' \ 'libqtdesigner>=4.4.0' 'openexr' 'jasper' 'shared-mime-info' 'libqtphonon' \ 'libungif' 'libqtwebkit' 'libqtopengl' 'libxdamage' 'soprano' \ - 'libxtst' 'libxcursor' ) + 'libxtst' 'libxcursor') makedepends=('enchant' 'hspell' 'avahi-compat' 'aspell' 'libqtxml>=4.4.0' \ 'libstrigiqtdbusclient' 'strigi' 'libqtgui>=4.4.0' 'libxrender' \ 'libxpm' 'libqt3support>=4.4.0' 'alsa-lib' 'libungif' \ @@ -21,7 +21,9 @@ replaces=('kat') archs=('i686' 'x86_64') _F_cmakekde_final=OFF Finclude kde -sha1sums=('1af2d185c88898b71f36b57f033e3a6d9839ab3d') +source=("${sour...@]}" default-fonts.patch) +sha1sums=('1af2d185c88898b71f36b57f033e3a6d9839ab3d' \ + '930a92c4ca784ed30dc7b1d3d42137434445d75f') # optimization OK diff --git a/source/kde/kdelibs/default-fonts.patch b/source/kde/kdelibs/default-fonts.patch new file mode 100644 index 000..9dcfc87 --- /dev/null +++ b/source/kde/kdelibs/default-fonts.patch @@ -0,0 +1,52 @@ +diff -Naur kdelibs-4.3.4/kdeui/kernel/kglobalsettings.cpp kdelibs-4.3.4-p/kdeui/kernel/kglobalsettings.cpp +--- kdelibs-4.3.4/kdeui/kernel/kglobalsettings.cpp 2009-10-30 13:26:22.0 +0100 kdelibs-4.3.4-p/kdeui/kernel/kglobalsettings.cpp 2010-01-19 11:18:12.0 +0100 +@@ -94,6 +94,7 @@ + WindowTitleFont, + TaskbarFont , + SmallestReadableFont, ++ DesktopFont, + FontTypesCount + }; + +@@ -381,7 +382,7 @@ + + // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp + static const char GeneralId[] = "General"; +-static const char DefaultFont[] ="Sans Serif"; ++static const char DefaultFont[] ="DejaVu Sans"; + #ifdef Q_WS_MAC + static const char DefaultMacFont[] = "Lucida Grande"; + #endif +@@ -394,14 +395,15 @@ + { GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif }, + { GeneralId, "menuFont",DefaultMacFont, 13, -1, QFont::SansSerif }, + #else +-{ GeneralId, "font",DefaultFont, 10, -1, QFont::SansSerif }, +-{ GeneralId, "fixed", "Monospace", 10, -1, QFont::TypeWriter }, +-{ GeneralId, "toolBarFont", DefaultFont, 8, -1, QFont::SansSerif }, +-{ GeneralId, "menuFont",DefaultFont, 10, -1, QFont::SansSerif }, +-#endif +-{ "WM", "activeFont", DefaultFont, 9, QFont::Bold, QFont::SansSerif },// inconsistency +-{ GeneralId, "taskbarFont", DefaultFont, 10, -1, QFont::SansSerif }, +-{ GeneralId, "smallestReadableFont", DefaultFont, 8, -1, QFont::SansSerif } ++{ GeneralId, "font",DefaultFont, 10, -1}, ++{ GeneralId, "fixed", "DejaVu Sans Mono", 10, -1}, ++{ GeneralId, "toolBarFont", DefaultFont, 10, -1}, ++{ GeneralId, "menuFont",DefaultFont, 11, -1}, ++#endif ++{ "WM", "activeFont", DefaultFont, 10, QFont::Bold},// inconsistency ++{ GeneralId, "taskbarFont", DefaultFont, 10, -1}, ++{ GeneralId, "smallestReadableFont", DefaultFont, 8, -1}, ++{ GeneralId, "desktopFont",DefaultFont, 9, -1} + }; + + QFont KGlobalSettingsData::font( FontTypes fontType ) +@@ -462,6 +464,7 @@ + // most preferred last + static const char* const PreferredFontNames[] = + { ++ "DejaVu Sans", + "Arial", + "Sans Serif", + "Verdana", ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] kdetesting: kdebase-workspace-4.3.4-8-x86_64 * Added kdm/default font patches * pannel one will follow ; ) * fixed depends()/makedepends() * not *yet* relbumped do NOT touch it ; )
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=ccb62a3c5bf36520c126db72fac1d7f3bdfd830c commit ccb62a3c5bf36520c126db72fac1d7f3bdfd830c Author: crazy Date: Tue Jan 19 11:57:08 2010 +0100 kdebase-workspace-4.3.4-8-x86_64 * Added kdm/default font patches * pannel one will follow ;) * fixed depends()/makedepends() * not *yet* relbumped do NOT touch it ;) diff --git a/source/kde/kdebase-workspace/FrugalBuild b/source/kde/kdebase-workspace/FrugalBuild index eb901b3..a45ccb5 100644 --- a/source/kde/kdebase-workspace/FrugalBuild +++ b/source/kde/kdebase-workspace/FrugalBuild @@ -14,13 +14,21 @@ rodepends=('kde-frugalware>=1.2') depends=('consolekit' 'libusb' 'libxcomposite' 'libxdamage' \ 'libxklavier>=4.0' 'libxxf86misc' 'lmsensors' 'libxtst' \ "kdebase-runtime>=$_F_kde_ver" "kdepimlibs>=$_F_kde_ver" \ - 'polkit-qt' 'qimageblitz' 'xdg-utils' 'dbus-x11') -makedepends=("${makedepen...@]}" 'boost' 'bluez-libs') -source=("${sour...@]}" systemsettings-root.patch) + 'polkit-qt' 'qimageblitz' 'xdg-utils' 'dbus-x11' 'libxscrnsaver') +makedepends=("${makedepen...@]}" 'boost' 'bluez-libs' 'sip>=4.10' 'pyqt4>=4.7' \ + "kdebindings>=$_F_kde_ver" 'xrdb') +## xrdb needed by font part .. from code in fonts.cpp ->: +## " proc << "xrdb" << "-quiet" << "-remove" << "-nocpp"; " +source=("${sour...@]}" \ + systemsettings-root.patch \ + kdm-make_it_cool.diff\ + default-fonts.patch) replaces=('ksensors' 'katapult' 'tastymenu' 'kbfx' 'kdesktop-menu' \ 'kicker-compiz' 'taskbar-compiz' 'mtaskbar' 'ksmoothdock') sha1sums=('5b43447139d22247d5bc2deee8e3a97f0bbf' \ - 'da461b91ab3ffaa5d29e2c88448ed61ed280b652') + 'da461b91ab3ffaa5d29e2c88448ed61ed280b652' \ + '5b16b82ff8f0084d15db9adf98c423906ff816e9' \ + '03a6acd95841885d684fc05f53566a0e36dd600a') subpkgs=("$pkgname-docs" "$pkgname-wallpapers") @@ -32,7 +40,7 @@ subarchs=('i686 x86_64' 'i686 x86_64') build() { - CMakeKDE_build + KDE_build ## No go 48MB extra wallpapers .. ## Kill from here and move to subpackage... @@ -46,7 +54,7 @@ build() done ## kdmrc should be in kde-fw package ( need to finish some kde-fw package first ) - #Fmv /etc/kde/config/kdm/kdmrc /etc/kde/config/kdm/kdmrc-kde4-$pkgver.orig + Fmv /etc/kde/config/kdm/kdmrc /etc/kde/config/kdm/kdmrc-kde4-$pkgver.orig } # optimization OK diff --git a/source/kde/kdebase-workspace/default-fonts.patch b/source/kde/kdebase-workspace/default-fonts.patch new file mode 100644 index 000..27da3d8 --- /dev/null +++ b/source/kde/kdebase-workspace/default-fonts.patch @@ -0,0 +1,27 @@ +diff -Naur kdebase-workspace-4.3.4/kcontrol/fonts/fonts.cpp kdebase-workspace-4.3.4-p/kcontrol/fonts/fonts.cpp +--- kdebase-workspace-4.3.4/kcontrol/fonts/fonts.cpp 2009-05-14 19:26:21.0 +0200 kdebase-workspace-4.3.4-p/kcontrol/fonts/fonts.cpp 2010-01-19 09:19:18.0 +0100 +@@ -512,14 +512,16 @@ + + // NOTE: keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp + +- QFont f0("Sans Serif", 10); +- QFont f1("Monospace", 10); +- QFont f2("Sans Serif", 8); +- QFont f3("Sans Serif", 9, QFont::Bold); +- QFont f4("Sans Serif", 10); +- QFont f5("Sans Serif", 8); // smallestReadableFont ++ QFont f0("DejaVu Sans", 10); // General ++ QFont f1("DejaVu Sans Mono", 10); // Fixed ++ QFont f2("DejaVu Sans", 8); // smallestReadableFont ++ QFont f3("DejaVu Sans", 10); // Toolbar ++ QFont f4("DejaVu Sans", 11); // Menu ++ QFont f5("DejaVu Sans", 10, QFont::Bold); // Window Tittle ++ QFont f6("DejaVu Sans", 10); // Taskbar ++ QFont f7("DejaVu Sans", 9); // Desktop + +- defaultFontList << f0 << f1 << f5 << f2 << f0 << f3 << f4 << f0; ++ defaultFontList << f0 << f1 << f2 << f3 << f4 << f5 << f6 << f7; + + QList fixedList; + diff --git a/source/kde/kdebase-workspace/kdm-make_it_cool.diff b/source/kde/kdebase-workspace/kdm-make_it_cool.diff new file mode 100644 index 000..c38fbf1 --- /dev/null +++ b/source/kde/kdebase-workspace/kdm-make_it_cool.diff @@ -0,0 +1,241 @@ +Index: kdm/kfrontend/kgreeter.cpp +=== +--- kdm/kfrontend/kgreeter.cpp.orig kdm/kfrontend/kgreeter.cpp +@@ -66,20 +66,20 @@ Foundation, Inc., 51 Franklin Street, Fi + + class UserListView : public QListWidget { + public: +- UserListView( QWidget *parent = 0 ) ++ UserListView( bool _themed, QWidget *parent = 0 ) + : QListWidget( parent ) + , cachedSizeHint( -1, 0 ) ++, themed( _themed ) + { + setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Ignored ); + setUniformItemSizes( true ); + setVerticalScrollMode( ScrollPerPixel ); + setIconSize( QSize( 48, 48 ) ); +- setAlternatingRowColors( true ); ++ setAlternatingRowColors( !themed ); + } + + mutable QSize cachedSizeHint; + +- protected: +
[Frugalware-git] frugalware-current: audacious-2.2-1-i686 * take over package from crazy
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=750134f574e0b97f046a26bae616737795e08902 commit 750134f574e0b97f046a26bae616737795e08902 Author: James Buren Date: Tue Jan 19 02:30:37 2010 -0600 audacious-2.2-1-i686 * take over package from crazy diff --git a/source/xmultimedia-extra/audacious/FrugalBuild b/source/xmultimedia-extra/audacious/FrugalBuild index c93488c..221992c 100644 --- a/source/xmultimedia-extra/audacious/FrugalBuild +++ b/source/xmultimedia-extra/audacious/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.37 SBU -# Maintainer: crazy +# Maintainer: James Buren pkgname=audacious pkgver=2.2 ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: audacious-plugins-2.2-1-i686 * take over package from crazy
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed67036b86a0d51caa0235fb190dbd3d1d210521 commit ed67036b86a0d51caa0235fb190dbd3d1d210521 Author: James Buren Date: Tue Jan 19 02:29:52 2010 -0600 audacious-plugins-2.2-1-i686 * take over package from crazy diff --git a/source/xmultimedia-extra/audacious-plugins/FrugalBuild b/source/xmultimedia-extra/audacious-plugins/FrugalBuild index 1dc9e8f..9cfc069 100644 --- a/source/xmultimedia-extra/audacious-plugins/FrugalBuild +++ b/source/xmultimedia-extra/audacious-plugins/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.37 SBU -# Maintainer: crazy +# Maintainer: James Buren pkgname=audacious-plugins pkgver=2.2 ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: tintin-1.99.9-1-i686 * version bump
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e895de0640af2d3141639c6ac65af146c08dc5b4 commit e895de0640af2d3141639c6ac65af146c08dc5b4 Author: James Buren Date: Tue Jan 19 02:27:29 2010 -0600 tintin-1.99.9-1-i686 * version bump diff --git a/source/games-extra/tintin/FrugalBuild b/source/games-extra/tintin/FrugalBuild index 5e72835..d80b312 100644 --- a/source/games-extra/tintin/FrugalBuild +++ b/source/games-extra/tintin/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=tintin -pkgver=1.99.8 +pkgver=1.99.9 pkgrel=1 pkgdesc="A console mud client from which other mud clients have been written." _F_googlecode_dirname="tintin-mud-client" @@ -10,7 +10,7 @@ Finclude googlecode depends=('zlib') groups=('games-extra') archs=('i686' 'x86_64') -sha1sums=('8a59535aa16845ff11d1799e6bb9d2ba65fab9bd') +sha1sums=('ee0607ff08734064594b099133f6f670fd7a7e8a') _F_cd_path="tt/src" build() ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git