From vmiklos at frugalware.org Thu Jun 1 00:06:01 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 00:06:02 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: disable adding frugalware-current.fdb & fpms for MEDIA=="net" Message-ID: <20060531220601.38317FB401A@genesis.frugalware.org> [mkiso: disable adding frugalware-current.fdb & fpms for MEDIA=="net" VMiklos **20060531211905] { hunk ./mkiso/mkiso.c 151 - iso_add(fp, "frugalware-%s/frugalware-current.fdb"); + if(!strcmp(MEDIA, "cd") || !strcmp(MEDIA, "dvd")) + iso_add(fp, "frugalware-%s/frugalware-current.fdb"); hunk ./mkiso/mkiso.c 218 + if(strcmp(MEDIA, "net")) } From vmiklos at frugalware.org Thu Jun 1 00:06:01 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 00:06:03 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: typo fix Message-ID: <20060531220601.9D4F6FB4017@genesis.frugalware.org> [mkiso: typo fix VMiklos **20060530105514] { hunk ./mkiso/mkiso.c 152 - if(!strcmp(MEDIA, dvd)) + if(!strcmp(MEDIA, "dvd")) } From vmiklos at frugalware.org Thu Jun 1 00:06:59 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 00:07:01 2006 Subject: [Frugalware-darcs] setup: select: added a misssing alpm_trans_release() Message-ID: <20060531220659.CD5D8FB401A@genesis.frugalware.org> [select: added a misssing alpm_trans_release() VMiklos **20060531214535 this blocked all the further transactions.. ] { hunk ./src/plugins/select.c 477 + alpm_trans_release(); } From vmiklos at frugalware.org Thu Jun 1 00:07:00 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 00:07:01 2006 Subject: [Frugalware-darcs] setup: install: don't try to stat() the not-yet-downloaded files in netinstall mode Message-ID: <20060531220700.3E0FCFB401A@genesis.frugalware.org> [install: don't try to stat() the not-yet-downloaded files in netinstall mode VMiklos **20060531211953] { hunk ./src/plugins/install.c 96 + if((char*)data_get(*config, "netinstall")==NULL) hunk ./src/plugins/install.c 142 + else + installpkgs_forreal(pkgs); } From janny at frugalware.org Thu Jun 1 00:18:18 2006 From: janny at frugalware.org (Janny) Date: Thu Jun 1 00:18:23 2006 Subject: [Frugalware-darcs] frugalware-current: qtparted-0.4.5-2-i686 Message-ID: <20060531221818.C0B00FB401A@genesis.frugalware.org> [qtparted-0.4.5-2-i686 Janny **20060531221909 recompiled with new parted (1.7.1) added cvs patch ] { addfile ./extra/source/xapps/qtparted/cvs_003.diff hunk ./extra/source/xapps/qtparted/FrugalBuild 1 -# Last modified: Sun, 28 Aug 2005 10:58:56 +0200 -# Compiling time: 0.23 SBU +# Last modified: Thu, 01 Jun 2006 00:02:41 +0200 +# Compiling time: 0.49 SBU hunk ./extra/source/xapps/qtparted/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./extra/source/xapps/qtparted/FrugalBuild 11 -depends=('libxi' 'progsreiserfs' 'expat' 'parted' 'libstdc++' 'qt' 'libxmu') -# not tested makedepends -#makedepends=('gnome-vfs' 'unsermake') +depends=('libxi' 'progsreiserfs' 'expat' 'parted>=1.7.1' 'libstdc++' 'qt' 'libxmu' 'ntfsprogs' 'jfsutils' 'xfsprogs') +makedepends=('gtkmm' 'unsermake') hunk ./extra/source/xapps/qtparted/FrugalBuild 15 -up2date="lynx -dump $url/download.en.html|grep $pkgname-[0-9\.]*\.tar.bz2|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://dl.sourceforge.net/sourceforge/qtparted/$pkgname-$pkgver.tar.bz2 desktop.patch) -sha1sums=('01bf8d1c7866544b410e5be14e2cfcaa5c16cd3d' 'c3a46dde93109b22af48c7d832a67ca0741e9a8a') -GZIP=1 +options=('scriptlet') +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge +source=(${source[@]} desktop.patch cvs_003.diff) +sha1sums=('01bf8d1c7866544b410e5be14e2cfcaa5c16cd3d' \ + 'c3a46dde93109b22af48c7d832a67ca0741e9a8a' \ + '14b31aac2d2845a382b93fac0cc3e5dff0e3a876') hunk ./extra/source/xapps/qtparted/FrugalBuild 25 - Fpatch desktop.patch + Fpatchall hunk ./extra/source/xapps/qtparted/FrugalBuild 28 - /usr/bin/unsermake all - /usr/bin/unsermake install DESTDIR="$Fdestdir" + /usr/bin/unsermake all || Fdie + /usr/bin/unsermake install DESTDIR="$Fdestdir" || Fdie hunk ./extra/source/xapps/qtparted/FrugalBuild 33 -# optimalization ok - -# vim: ft=sh - hunk ./extra/source/xapps/qtparted/cvs_003.diff 1 +diff -Naur qtparted-0.4.5.orig/src/main.cpp qtparted-0.4.5/src/main.cpp +--- qtparted-0.4.5.orig/src/main.cpp 2005-07-06 23:29:54.000000000 +0200 ++++ qtparted-0.4.5/src/main.cpp 2005-10-15 12:58:31.000000000 +0200 +@@ -1,22 +1,22 @@ + /* +- qtparted - a frontend to libparted for manipulating disk partitions +- Copyright (C) 2002-2003 Vanni Brutto ++ qtparted - a frontend to libparted for manipulating disk partitions ++ Copyright (C) 2002-2003 Vanni Brutto + +- Vanni Brutto ++ Vanni Brutto + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + /* About main.cpp +@@ -50,14 +50,14 @@ + + void print_usage(const char *program_name) { + cout << "Usage: " << program_name << " [OPTION]..." << endl +- << "A nice QT GUI for libparted" << endl << endl +- << "Options used by qtparted:" << endl +- << " -l, --log=value use 1 to enable log, 0 for disable it." << endl +- << " [default = 1])" << endl +- << " -h, --help Show this usage message" << endl +- << endl << endl +- << program_name << " by Zanac copyright 2003, (C) 2005 Ark Linux" << endl +- << "Send bug reports to bero@arklinux.org" << endl; ++ << "A nice QT GUI for libparted" << endl << endl ++ << "Options used by qtparted:" << endl ++ << " -l, --log=value use 1 to enable log, 0 for disable it." << endl ++ << " [default = 1])" << endl ++ << " -h, --help Show this usage message" << endl ++ << endl << endl ++ << program_name << " by Zanac copyright 2003, (C) 2005 Ark Linux" << endl ++ << "Send bug reports to bero@arklinux.org" << endl; + exit(EXIT_SUCCESS); + } + +@@ -69,108 +69,106 @@ + // from another QWS application (OPIE, Ark Linux installer, .....) - so we + // add a configure option to turn it off... + #if defined(Q_WS_QWS) && !defined(QWS_CLIENT) // Frame Buffer +- QApplication app(argc, argv, QApplication::GuiServer); ++ QApplication app(argc, argv, QApplication::GuiServer); + #else // X11 +- QApplication app(argc, argv); ++ QApplication app(argc, argv); + #endif // Q_WS_QWS + +- /*---program name ;)---*/ +- const char *program_name = argv[0]; ++ /*---program name ;)---*/ ++ const char *program_name = argv[0]; + +- int next_option; ++ int next_option; + +- /*---Flag log on/off, default 1 = on---*/ +- int iLog = 1; ++ /*---Flag log on/off, default 1 = on---*/ ++ int iLog = 1; + +- /*---valid short options---*/ +- const char *const short_options = "hl:"; +- +- /*---valid long options---*/ +- const struct option long_options[] = { +- { "help", 0, NULL, 'h' }, +- { "log", 1, NULL, 'l' }, +- { NULL, 0, NULL, 0 } // end of getopt array +- }; +- +- do { +- next_option = getopt_long(argc, +- argv, +- short_options, +- long_options, +- NULL); +- +- switch (next_option) { +- case 'h': // -h ... --help +- print_usage(program_name); +- break; +- +- case 'l': // -l ... --log +- if (!sscanf(optarg, "%d", &iLog)) { +- printf("You must specify a numeric value.\n" +- "Parameter \"%s\" is not valid for --log\n\n", optarg); +- print_usage(program_name); +- } +- +- if ((iLog != 0) && (iLog != 1)) { +- printf("You must use 1/0 to set log on/off.\n" +- "Parameter \"%s\" is not valid for --log\n\n", optarg); +- print_usage(program_name); +- } +- +- break; +- +- case '?': // opzione invalida :( +- print_usage(program_name); +- +- case -1: // opzioni concluse +- break; +- +- default: // errore! inaspettato pure! +- abort(); +- } +- } while (next_option != -1); +- +- /*---install translation file for application strings---*/ +- QTranslator *translator = new QTranslator(0); +- translator->load(QString(DATADIR "/locale/qtparted_") + QString(QTextCodec::locale())); +- app.installTranslator(translator); +- +- /*---initialize the debug system---*/ +- if (iLog) g_debug.open(); +- showDebug("QtParted debug logfile (http://qtparted.sf.net) version %s\n---------\n", VERSION); +- +- /*---check the Parted version---*/ +- if (!QP_LibParted::checkForParted()) +- return EXIT_FAILURE; +- +- /*---check if the kernel support devfs---*/ +- isDevfsEnabled(); +- +- QP_Settings settings; +- +- mainwindow = new QP_MainWindow(&settings, 0, "QP_MainWindow"); +- app.setMainWidget(mainwindow); +- +- QSplashScreen *splash=new QSplashScreen(QPixmap(DATADIR "/pics/qtp_splash.png"), Qt::WType_Modal | Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WDestructiveClose); +- splash->connect(mainwindow, SIGNAL(sigSplashInfo(const QString &)), +- SLOT(message(const QString &))); +- splash->finish(mainwindow); +- splash->show(); ++ /*---valid short options---*/ ++ const char *const short_options = "hl:"; ++ ++ /*---valid long options---*/ ++ const struct option long_options[] = { ++ { "help", 0, NULL, 'h' }, ++ { "log", 1, NULL, 'l' }, ++ { NULL, 0, NULL, 0 } // end of getopt array ++ }; ++ ++ do { ++ next_option = getopt_long(argc, ++ argv, ++ short_options, ++ long_options, ++ NULL); ++ ++ switch (next_option) { ++ case 'h': // -h ... --help ++ print_usage(program_name); ++ break; ++ ++ case 'l': // -l ... --log ++ if (!sscanf(optarg, "%d", &iLog)) { ++ printf("You must specify a numeric value.\n" ++ "Parameter \"%s\" is not valid for --log\n\n", optarg); ++ print_usage(program_name); ++ } ++ ++ if ((iLog != 0) && (iLog != 1)) { ++ printf("You must use 1/0 to set log on/off.\n" ++ "Parameter \"%s\" is not valid for --log\n\n", optarg); ++ print_usage(program_name); ++ } ++ break; ++ ++ case '?': // opzione invalida :( ++ print_usage(program_name); ++ ++ case -1: // opzioni concluse ++ break; ++ ++ default: // errore! inaspettato pure! ++ abort(); ++ } ++ } while (next_option != -1); ++ ++ /*---install translation file for application strings---*/ ++ QTranslator *translator = new QTranslator(0); ++ translator->load(QString(DATADIR "/locale/qtparted_") + QString(QTextCodec::locale())); ++ app.installTranslator(translator); ++ ++ /*---initialize the debug system---*/ ++ if (iLog) g_debug.open(); ++ showDebug("QtParted debug logfile (http://qtparted.sf.net) version %s\n---------\n", VERSION); ++ ++ /*---check the Parted version---*/ ++ if (!QP_LibParted::checkForParted()) ++ return EXIT_FAILURE; ++ ++ /*---check if the kernel support devfs---*/ ++ isDevfsEnabled(); ++ ++ QP_Settings settings; ++ ++ mainwindow = new QP_MainWindow(&settings, 0, "QP_MainWindow"); ++ app.setMainWidget(mainwindow); ++ ++ QSplashScreen *splash=new QSplashScreen(QPixmap(DATADIR "/pics/qtp_splash.png"), Qt::WType_Modal | Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WDestructiveClose); ++ splash->connect(mainwindow, SIGNAL(sigSplashInfo(const QString &)), ++ SLOT(message(const QString &))); ++ splash->finish(mainwindow); ++ splash->show(); + +- mainwindow->init(); ++ mainwindow->init(); + + #ifdef Q_WS_QWS // Frame Buffer +- mainwindow->showMaximized(); ++ mainwindow->showMaximized(); + #endif // Q_WS_QWS + ++ mainwindow->show(); + +- mainwindow->show(); ++ bool rc = app.exec(); + +- bool rc = app.exec(); ++ delete mainwindow; + +- delete mainwindow; ++ if (iLog) g_debug.close(); + +- if (iLog) g_debug.close(); +- +- return rc; ++ return rc; + } +diff -Naur qtparted-0.4.5.orig/src/qp_actlist.cpp qtparted-0.4.5/src/qp_actlist.cpp +--- qtparted-0.4.5.orig/src/qp_actlist.cpp 2004-04-17 12:14:15.000000000 +0200 ++++ qtparted-0.4.5/src/qp_actlist.cpp 2005-10-15 12:35:30.000000000 +0200 +@@ -28,775 +28,753 @@ + #include "statistics.h" + + /*---type (move+resize), num, start, end---*/ +-QP_ActListItem::QP_ActListItem(QTParted::actType action, +- int num, +- PedSector start, +- PedSector end, +- PedGeometry geom, +- PedPartitionType part_type) { +- showDebug("%s", "actlistitem::actlistitem, move/resize\n"); +- +- _action = action; +- _num = num; +- _start = start; +- _end = end; +- _geom = geom; +- _part_type = part_type; ++QP_ActListItem::QP_ActListItem(QTParted::actType action, int num, ++ PedSector start, PedSector end, ++ PedGeometry geom, PedPartitionType part_type) ++ :_action(action),_num(num),_start(start), ++ _end(end),_geom(geom),_part_type(part_type) ++{ ++ showDebug("%s", "actlistitem::actlistitem, move/resize\n"); + } + + /*---type, num---*/ +-QP_ActListItem::QP_ActListItem(QTParted::actType action, +- int num) { +- showDebug("%s", "actlistitem::actlistitem, rm\n"); +- +- _action = action; +- _num = num; ++QP_ActListItem::QP_ActListItem(QTParted::actType action, int num) ++ :_action(action),_num(num) ++{ ++ showDebug("%s", "actlistitem::actlistitem, rm\n"); + } + +-QP_ActListItem::QP_ActListItem(QTParted::actType action, +- int num, +- bool status) { +- showDebug("%s", "actlistitem::actlistitem, active\n"); +- +- _action = action; +- _num = num; +- _status = status; ++QP_ActListItem::QP_ActListItem(QTParted::actType action, int num, bool status) ++ :_action(action),_num(num),_status(status) ++{ ++ showDebug("%s", "actlistitem::actlistitem, active\n"); + } + + /*---for format! :)---*/ + QP_ActListItem::QP_ActListItem(QTParted::actType action, +- int num, +- QP_FileSystemSpec *fsspec, +- QString label, +- PedGeometry geom, +- PedPartitionType part_type) { +- showDebug("%s", "actlistitem::actlistitem, mkfs\n"); +- +- _action = action; +- _num = num; +- _fsspec = fsspec; +- _label = label; +- _geom = geom; +- _part_type = part_type; ++ int num, ++ QP_FileSystemSpec *fsspec, ++ QString label, ++ PedGeometry geom, ++ PedPartitionType part_type) ++ :_action(action),_num(num),_fsspec(fsspec) ++ ,_label(label),_geom(geom),_part_type(part_type) ++{ ++ showDebug("%s", "actlistitem::actlistitem, mkfs\n"); + } + + /*---type, logical/extended, start, end, typoFS, label---*/ + QP_ActListItem::QP_ActListItem(QTParted::actType action, +- QTParted::partType type, +- PedSector start, +- PedSector end, +- QP_FileSystemSpec *fsspec, +- QString label, +- PedGeometry geom, +- PedPartitionType part_type) { +- showDebug("%s", "actlistitem::actlistitem, mkpartfs\n"); +- +- _action = action; +- _type = type; +- _start = start; +- _end = end; +- _fsspec = fsspec; +- _label = label; +- _geom = geom; +- _part_type = part_type; +-} +- +-QP_ActionList::QP_ActionList(QP_LibParted *libparted) { +- showDebug("%s", "actionlist::actionlist\n"); +- +- /*---prevent from memory leak: when list are cleared destroy actlistitem object!---*/ +- actlist.setAutoDelete(true); +- +- /*---prevent from memory leak: when list are cleared destroy partinfo object!---*/ +- orig_logilist.setAutoDelete(true); +- orig_partlist.setAutoDelete(true); +- +- +- PedDisk *disk; +- _libparted = libparted; +- +- /*---save of the original device state---*/ +- disk = ped_disk_new(_libparted->dev); +- if (!disk) { +- showDebug("%s", "actionlist::actionlist, ped_disk_new ko\n"); +- +- QString label = QString(tr("Critical error during ped_disk_new!")); +- QMessageBox::information(NULL, PROG_NAME, label); +- +- return ; +- } +- +- listdisk.append(disk); +- +- /*---make a backup of the disk (we will use this)---*/ +- _disk = ped_disk_duplicate(disk); +- if (!_disk) { +- showDebug("%s", "actionlist::actionlist, ped_disk_duplicate ko\n"); +- ped_disk_destroy(disk); +- listdisk.removeLast(); +- disk = NULL; +- +- QString label = QString(tr("Critical error during ped_disk_duplicate!")); +- QMessageBox::information(NULL, PROG_NAME, label); ++ QTParted::partType type, ++ PedSector start, ++ PedSector end, ++ QP_FileSystemSpec *fsspec, ++ QString label, ++ PedGeometry geom, ++ PedPartitionType part_type) ++ :_action(action), _type(type), _start(start) ++ ,_end(end), _fsspec(fsspec), _label(label) ++ ,_geom(geom), _part_type(part_type) ++{ ++ showDebug("%s", "actlistitem::actlistitem, mkpartfs\n"); ++} ++ ++QP_ActionList::QP_ActionList(QP_LibParted *libparted):_libparted(libparted) ++{ ++ showDebug("%s", "actionlist::actionlist\n"); ++ ++ /*---prevent from memory leak: when list are cleared destroy actlistitem object!---*/ ++ actlist.setAutoDelete(true); ++ ++ /*---prevent from memory leak: when list are cleared destroy partinfo object!---*/ ++ orig_logilist.setAutoDelete(true); ++ orig_partlist.setAutoDelete(true); ++ ++ ++ PedDisk *disk; ++ ++ /*---save of the original device state---*/ ++ disk = ped_disk_new(_libparted->dev); ++ if (!disk) { ++ showDebug("%s", "actionlist::actionlist, ped_disk_new ko\n"); ++ ++ QString label = QString(tr("Critical error during ped_disk_new!")); ++ QMessageBox::information(NULL, PROG_NAME, label); + +- return ; +- } ++ return ; ++ } ++ ++ listdisk.append(disk); ++ ++ /*---make a backup of the disk (we will use this)---*/ ++ _disk = ped_disk_duplicate(disk); ++ if (!_disk) { ++ showDebug("%s", "actionlist::actionlist, ped_disk_duplicate ko\n"); ++ ped_disk_destroy(disk); ++ listdisk.removeLast(); ++ disk = NULL; ++ ++ QString label = QString(tr("Critical error during ped_disk_duplicate!")); ++ QMessageBox::information(NULL, PROG_NAME, label); ++ ++ return ; ++ } + +- /*---make the partlist of the disk---*/ +- scan_partitions(); ++ /*---make the partlist of the disk---*/ ++ scan_partitions(); + } + + QP_ActionList::~QP_ActionList() { +- showDebug("%s", "actionlist::~actionlist\n"); ++ showDebug("%s", "actionlist::~actionlist\n"); + +- actlist.clear(); +- orig_logilist.clear(); +- orig_partlist.clear(); +- ++ actlist.clear(); ++ orig_logilist.clear(); ++ orig_partlist.clear(); ++ + } + + void QP_ActionList::update_listpartitions() { +- showDebug("%s", "actionlist::update_listpartitions\n"); ++ showDebug("%s", "actionlist::update_listpartitions\n"); + +- /*---initialize active partition---*/ +- _partActive = NULL; ++ /*---initialize active partition---*/ ++ _partActive = NULL; + +- logilist.clear(); +- partlist.clear(); ++ logilist.clear(); ++ partlist.clear(); + +- _libparted->has_extended = false; ++ _libparted->has_extended = false; + + +- /*---look if exist a partition in orig_list that match with the partitions into disk device---*/ +- PedConstraint* constraint = NULL; ++ /*---look if exist a partition in orig_list that match with the partitions into disk device---*/ ++ PedConstraint* constraint = NULL; + PedPartition* part = NULL; + for (part = ped_disk_next_partition(disk(), NULL); part; +- part = ped_disk_next_partition(disk(), part)) { ++ part = ped_disk_next_partition(disk(), part)) { + +- if (part->type & PED_PARTITION_METADATA) +- continue; ++ if (part->type & PED_PARTITION_METADATA) ++ continue; + +- QP_PartInfo *found = NULL; +- +- /*---if not freespace...*/ +- if (!(part->type & PED_PARTITION_FREESPACE)) { +- /*---loop for all partition of the disk---*/ +- QP_PartInfo *p; +- for (p = (QP_PartInfo*)orig_partlist.first(); p; p = (QP_PartInfo*)orig_partlist.next()) { +- if (p->type != QTParted::extended) { +- if ((p->_geometry.start == part->geom.start) +- && (p->_geometry.end == part->geom.end) +- && (p->_geometry.length == part->geom.length)) { +- found = p; +- } +- } else { +- QP_PartInfo *logi; +- /*---loop for every logical partitions---*/ +- for (logi = (QP_PartInfo*)orig_logilist.first(); logi; logi = (QP_PartInfo*)orig_logilist.next()) { +- if ((logi->_geometry.start == part->geom.start) +- && (logi->_geometry.end == part->geom.end) +- && (logi->_geometry.length == part->geom.length)) { +- found = logi; +- } +- } +- } +- } +- } +- +- showDebug("%s", "actionlist::update_listpartitions, looked if partition was in orig_logilist\n"); +- +- QP_PartInfo *partinfo; +- if (found) { +- showDebug("%s", "actionlist::update_listpartitions, partition matched!\n"); +- partinfo = new QP_PartInfo(); +- partinfo->start = found->start; +- partinfo->end = found->end; +- partinfo->_geometry = found->_geometry; +- partinfo->setDevice(found->device()); +- partinfo->min_size = found->min_size; +- partinfo->_label = found->_label; +- partinfo->_free = found->_free; +- partinfo->_unknow = found->_unknow; +- partinfo->_libparted = found->_libparted; +- partinfo->_active = found->_active; +- partinfo->_canBeActive = found->_canBeActive; +- partinfo->_canBeHidden = found->_canBeHidden; +- partinfo->_virtual = found->_virtual; +- partinfo->fsspec = found->fsspec; +- } else { +- showDebug("%s", "actionlist::update_listpartitions, partition missmatched!\n"); +- partinfo = new QP_PartInfo(); +- partinfo->start = part->geom.start; +- partinfo->end = part->geom.end; +- partinfo->_geometry = part->geom; +- partinfo->setDevice(_libparted->_qpdevice); +- partinfo->min_size = -1; +- partinfo->_label = QString::null; +- partinfo->_free = _libparted->filesystem->free(); +- partinfo->_unknow = _libparted->filesystem->unknow(); +- partinfo->_libparted = _libparted; +- partinfo->_active = false; +- partinfo->_canBeActive = false; +- partinfo->_canBeHidden = false; +- partinfo->_virtual = false; +- +- +- const char *part_filesystem = part->fs_type ? part->fs_type->name : ""; +- if (part->type & PED_PARTITION_FREESPACE) { +- partinfo->fsspec = _libparted->filesystem->free(); +- } else { +- partinfo->fsspec = _libparted->filesystem->nameToFSSpec(part_filesystem); //fat16, fat32 etc etc +- } +- } +- +- //'cause the number can change use ALWAYS the right PedPartition number! +- partinfo->num = part->num; +- +- if (part->type & PED_PARTITION_LOGICAL) +- partinfo->type = QTParted::logical; +- else if (part->type & PED_PARTITION_EXTENDED) { +- partinfo->type = QTParted::extended; +- _libparted->has_extended = true; +- } +- else partinfo->type = QTParted::primary; +- +- +- showDebug("%s", "actionlist::update_listpartitions, get partitions flags\n"); +- +- //---get how much the partition can grow at left and at right +- //---get also if the partiton is "active" +- //---of course do all this stuff only if this is not freespace ;) +- //FIXME: t_start/t_end if the partition is free? is right? +- if (!partinfo->isFree()) { +- constraint = ped_constraint_any(_libparted->dev); +- PedGeometry *geometry = ped_disk_get_max_partition_geometry(disk(), part, constraint); +- if (geometry != NULL) { +- partinfo->t_start = geometry->start; +- partinfo->t_end = geometry->end; +- } else { +- partinfo->t_start = -1; +- partinfo->t_end = -1; +- } +- +- /*---get if the partition is active---*/ +- partition_get_flags(partinfo, part); +- } +- +- showDebug("%s", "actionlist::update_listpartitions, get partition infos\n"); +- +- /*---compare if the partition has not committed... and if so update +- * some field (ie filesystem, and active flag, to reflect the change that +- * use made on listchart but that are not saved on the disk!---*/ +- get_partinfo(partinfo, part); +- +- /*---if this is a virtual partition do not show how space fill the device---*/ +- if (partinfo->isVirtual()) { +- partinfo->min_size = -1; +- } +- +- showDebug("%s", "actionlist::update_listpartitions, append the partition to partlist\n"); +- if (partinfo->type == QTParted::logical) +- logilist.append(partinfo); +- else partlist.append(partinfo); ++ QP_PartInfo *found = NULL; ++ ++ /*---if not freespace...*/ ++ if (!(part->type & PED_PARTITION_FREESPACE)) { ++ /*---loop for all partition of the disk---*/ ++ QP_PartInfo *p; ++ for (p = (QP_PartInfo*)orig_partlist.first(); p; p = (QP_PartInfo*)orig_partlist.next()) { ++ if (p->type != QTParted::extended) { ++ if ((p->_geometry.start == part->geom.start) ++ && (p->_geometry.end == part->geom.end) ++ && (p->_geometry.length == part->geom.length)) { ++ found = p; ++ } ++ } else { ++ QP_PartInfo *logi; ++ /*---loop for every logical partitions---*/ ++ for (logi = (QP_PartInfo*)orig_logilist.first(); logi; logi = (QP_PartInfo*)orig_logilist.next()) { ++ if ((logi->_geometry.start == part->geom.start) ++ && (logi->_geometry.end == part->geom.end) ++ && (logi->_geometry.length == part->geom.length)) { ++ found = logi; ++ } ++ } ++ } ++ } ++ } ++ ++ showDebug("%s", "actionlist::update_listpartitions, looked if partition was in orig_logilist\n"); ++ ++ QP_PartInfo *partinfo; ++ if (found) { ++ showDebug("%s", "actionlist::update_listpartitions, partition matched!\n"); ++ partinfo = new QP_PartInfo(); ++ partinfo->start = found->start; ++ partinfo->end = found->end; ++ partinfo->_geometry = found->_geometry; ++ partinfo->setDevice(found->device()); ++ partinfo->min_size = found->min_size; ++ partinfo->_label = found->_label; ++ partinfo->_free = found->_free; ++ partinfo->_unknow = found->_unknow; ++ partinfo->_libparted = found->_libparted; ++ partinfo->_active = found->_active; ++ partinfo->_canBeActive = found->_canBeActive; ++ partinfo->_canBeHidden = found->_canBeHidden; ++ partinfo->_virtual = found->_virtual; ++ partinfo->fsspec = found->fsspec; ++ } else { ++ showDebug("%s", "actionlist::update_listpartitions, partition missmatched!\n"); ++ partinfo = new QP_PartInfo(); ++ partinfo->start = part->geom.start; ++ partinfo->end = part->geom.end; ++ partinfo->_geometry = part->geom; ++ partinfo->setDevice(_libparted->_qpdevice); ++ partinfo->min_size = -1; ++ partinfo->_label = QString::null; ++ partinfo->_free = _libparted->filesystem->free(); ++ partinfo->_unknow = _libparted->filesystem->unknow(); ++ partinfo->_libparted = _libparted; ++ partinfo->_active = false; ++ partinfo->_canBeActive = false; ++ partinfo->_canBeHidden = false; ++ partinfo->_virtual = false; ++ ++ ++ const char *part_filesystem = part->fs_type ? part->fs_type->name : ""; ++ if (part->type & PED_PARTITION_FREESPACE) { ++ partinfo->fsspec = _libparted->filesystem->free(); ++ } else { ++ partinfo->fsspec = _libparted->filesystem->nameToFSSpec(part_filesystem); //fat16, fat32 etc etc ++ } ++ } ++ ++ //'cause the number can change use ALWAYS the right PedPartition number! ++ partinfo->num = part->num; ++ ++ if (part->type & PED_PARTITION_LOGICAL) ++ partinfo->type = QTParted::logical; ++ else if (part->type & PED_PARTITION_EXTENDED) { ++ partinfo->type = QTParted::extended; ++ _libparted->has_extended = true; ++ } ++ else partinfo->type = QTParted::primary; ++ ++ ++ showDebug("%s", "actionlist::update_listpartitions, get partitions flags\n"); ++ ++ //---get how much the partition can grow at left and at right ++ //---get also if the partiton is "active" ++ //---of course do all this stuff only if this is not freespace ;) ++ //FIXME: t_start/t_end if the partition is free? is right? ++ if (!partinfo->isFree()) { ++ constraint = ped_constraint_any(_libparted->dev); ++ PedGeometry *geometry = ped_disk_get_max_partition_geometry(disk(), part, constraint); ++ if (geometry != NULL) { ++ partinfo->t_start = geometry->start; ++ partinfo->t_end = geometry->end; ++ } else { ++ partinfo->t_start = -1; ++ partinfo->t_end = -1; ++ } ++ ++ /*---get if the partition is active---*/ ++ partition_get_flags(partinfo, part); ++ } ++ ++ showDebug("%s", "actionlist::update_listpartitions, get partition infos\n"); ++ ++ /*---compare if the partition has not committed... and if so update ++ * some field (ie filesystem, and active flag, to reflect the change that ++ * use made on listchart but that are not saved on the disk!---*/ ++ get_partinfo(partinfo, part); ++ ++ /*---if this is a virtual partition do not show how space fill the device---*/ ++ if (partinfo->isVirtual()) { ++ partinfo->min_size = -1; ++ } ++ ++ showDebug("%s", "actionlist::update_listpartitions, append the partition to partlist\n"); ++ if (partinfo->type == QTParted::logical) ++ logilist.append(partinfo); ++ else partlist.append(partinfo); + +- } ++ } + + } + + void QP_ActionList::scan_partitions() { +- showDebug("%s", "actionlist::scan_partitions\n"); ++ showDebug("%s", "actionlist::scan_partitions\n"); + +- /*---initialize active partition---*/ +- _partActive = NULL; ++ /*---initialize active partition---*/ ++ _partActive = NULL; + +- orig_logilist.clear(); +- orig_partlist.clear(); ++ orig_logilist.clear(); ++ orig_partlist.clear(); + +- PedConstraint *constraint = NULL; ++ PedConstraint *constraint = NULL; + PedPartition *part = NULL; + for (part = ped_disk_next_partition(disk(), NULL); part; +- part = ped_disk_next_partition(disk(), part)) { ++ part = ped_disk_next_partition(disk(), part)) { ++ ++ if (part->type & PED_PARTITION_METADATA) ++ continue; ++ ++ showDebug("%s", "actionlist::scan_partitions, create a new partinfo\n"); ++ QP_PartInfo *partinfo = new QP_PartInfo(); ++ partinfo->start = part->geom.start; ++ partinfo->end = part->geom.end; ++ partinfo->_geometry = part->geom; ++ partinfo->num = part->num; ++ partinfo->setDevice(_libparted->_qpdevice); ++ partinfo->min_size = -1; ++ partinfo->_label = QString::null; ++ partinfo->_free = _libparted->filesystem->free(); ++ partinfo->_unknow = _libparted->filesystem->unknow(); ++ partinfo->_libparted = _libparted; ++ partinfo->_active = false; ++ partinfo->_canBeActive = false; ++ partinfo->_canBeHidden = false; ++ partinfo->_virtual = false; ++ ++ if (part->type & PED_PARTITION_LOGICAL) ++ partinfo->type = QTParted::logical; ++ else if (part->type & PED_PARTITION_EXTENDED) { ++ partinfo->type = QTParted::extended; ++ } ++ else partinfo->type = QTParted::primary; ++ ++ const char *part_filesystem = part->fs_type ? part->fs_type->name : ""; ++ ++ if (part->type & PED_PARTITION_FREESPACE) { ++ partinfo->fsspec = _libparted->filesystem->free(); ++ partinfo->t_start = -1; ++ partinfo->t_end = -1; ++ } else { ++ showDebug("%s", "actionlist::scan_partitions, get partinfo flags\n"); ++ /*---get if the partition is active---*/ ++ partition_get_flags(partinfo, part); ++ ++ showDebug("%s", "actionlist::scan_partitions, get partinfo fsspec\n"); ++ partinfo->fsspec = _libparted->filesystem->nameToFSSpec(part_filesystem); //fat16, fat32 etc etc ++ ++ //---get how much the partition can grow at left and at right, but only if the partition is not free space! ++ constraint = ped_constraint_any(_libparted->dev); ++ PedGeometry *geometry = ++ ped_disk_get_max_partition_geometry(disk(), part, constraint); ++ if (geometry != NULL) { ++ partinfo->t_start = geometry->start; ++ partinfo->t_end = geometry->end; ++ } else { ++ partinfo->t_start = -1; ++ partinfo->t_end = -1; ++ } ++ } ++ ++ showDebug("%s", "actionlist::scan_partitions, append partinfo to orig_partlist\n"); ++ ++ if (partinfo->type == QTParted::logical) ++ orig_logilist.append(partinfo); ++ else orig_partlist.append(partinfo); ++ } ++ + +- if (part->type & PED_PARTITION_METADATA) +- continue; + +- showDebug("%s", "actionlist::scan_partitions, create a new partinfo\n"); +- QP_PartInfo *partinfo = new QP_PartInfo(); +- partinfo->start = part->geom.start; +- partinfo->end = part->geom.end; +- partinfo->_geometry = part->geom; +- partinfo->num = part->num; +- partinfo->setDevice(_libparted->_qpdevice); +- partinfo->min_size = -1; +- partinfo->_label = QString::null; +- partinfo->_free = _libparted->filesystem->free(); +- partinfo->_unknow = _libparted->filesystem->unknow(); +- partinfo->_libparted = _libparted; +- partinfo->_active = false; +- partinfo->_canBeActive = false; +- partinfo->_canBeHidden = false; +- partinfo->_virtual = false; +- +- if (part->type & PED_PARTITION_LOGICAL) +- partinfo->type = QTParted::logical; +- else if (part->type & PED_PARTITION_EXTENDED) { +- partinfo->type = QTParted::extended; +- } +- else partinfo->type = QTParted::primary; +- +- const char *part_filesystem = part->fs_type ? part->fs_type->name : ""; +- +- if (part->type & PED_PARTITION_FREESPACE) { +- partinfo->fsspec = _libparted->filesystem->free(); +- partinfo->t_start = -1; +- partinfo->t_end = -1; +- } else { +- showDebug("%s", "actionlist::scan_partitions, get partinfo flags\n"); +- /*---get if the partition is active---*/ +- partition_get_flags(partinfo, part); +- +- showDebug("%s", "actionlist::scan_partitions, get partinfo fsspec\n"); +- partinfo->fsspec = _libparted->filesystem->nameToFSSpec(part_filesystem); //fat16, fat32 etc etc +- +- //---get how much the partition can grow at left and at right, but only if the partition is not free space! +- constraint = ped_constraint_any(_libparted->dev); +- PedGeometry *geometry = +- ped_disk_get_max_partition_geometry(disk(), part, constraint); +- if (geometry != NULL) { +- partinfo->t_start = geometry->start; +- partinfo->t_end = geometry->end; +- } else { +- partinfo->t_start = -1; +- partinfo->t_end = -1; +- } +- } +- +- showDebug("%s", "actionlist::scan_partitions, append partinfo to orig_partlist\n"); +- +- if (partinfo->type == QTParted::logical) +- orig_logilist.append(partinfo); +- else orig_partlist.append(partinfo); +- } +- +- +- +- /*---count how partition are in the disk---*/ +- int totPart = orig_partlist.count() + orig_logilist.count(); +- +- showDebug("%s", "actionlist::scan_partitions, loop into orig_partlist\n"); +- +- /*---loop for all partition of the disk---*/ +- QP_PartInfo *p; +- int i = 0; +- for (p = (QP_PartInfo*)orig_partlist.first(); p; p = (QP_PartInfo*)orig_partlist.next()) { +- if (p->type != QTParted::extended) { +- i++; +- if (!p->isFree()) { +- /*---emit a signal for update the progressbar---*/ +- _libparted->_message = QString(tr("Getting info about partition %1.")) +- .arg(p->partname()); +- _libparted->emitSigTimer(i*100/totPart, _libparted->message(), QString::null); +- +- /*---get info about this primary partition---*/ +- part = ped_disk_get_partition(disk(), p->num); +- if (part) get_partfilesystem_info(part, p); +- else showDebug("%s", "actionlist::scan_partitions, get_partfilesystem_info ko\n"); +- +- /*---get the label of this primary partition---*/ +- if (part) get_partfilesystem_label(part, p); +- else showDebug("%s", "actionlist::scan_partitions, get_partfilesystem_label ko\n"); +- } +- } else { +- QP_PartInfo *logi; +- /*---loop for every logical partitions---*/ +- for (logi = (QP_PartInfo*)orig_logilist.first(); logi; logi = (QP_PartInfo*)orig_logilist.next()) { +- i++; +- if (!logi->isFree()) { +- /*---emit a signal for update the progressbar---*/ +- _libparted->_message = QString(tr("Getting info about partition %1.")) +- .arg(logi->partname()); +- _libparted->emitSigTimer(i*100/totPart, _libparted->message(), QString::null); +- +- /*---get info about this logical partition---*/ +- part = ped_disk_get_partition(disk(), logi->num); +- if (part) get_partfilesystem_info(part, logi); +- else showDebug("%s", "actionlist::scan_partitions, get_partfilesystem_info ko\n"); +- +- /*---get the label of this logical partition---*/ +- if (part) get_partfilesystem_label(part, logi); +- else showDebug("%s", "actionlist::scan_partitions, get_partfilesystem_label ko\n"); +- } +- } +- } +- } +- +- _libparted->emitSigTimer(100, _libparted->message(), QString::null); ++ /*---count how partition are in the disk---*/ ++ int totPart = orig_partlist.count() + orig_logilist.count(); ++ ++ showDebug("%s", "actionlist::scan_partitions, loop into orig_partlist\n"); ++ ++ /*---loop for all partition of the disk---*/ ++ QP_PartInfo *p; ++ int i = 0; ++ for (p = (QP_PartInfo*)orig_partlist.first(); p; p = (QP_PartInfo*)orig_partlist.next()) { ++ if (p->type != QTParted::extended) { ++ i++; ++ if (!p->isFree()) { ++ /*---emit a signal for update the progressbar---*/ ++ _libparted->_message = QString(tr("Getting info about partition %1.")) ++ .arg(p->partname()); ++ _libparted->emitSigTimer(i*100/totPart, _libparted->message(), QString::null); ++ ++ /*---get info about this primary partition---*/ ++ part = ped_disk_get_partition(disk(), p->num); ++ if (part) get_partfilesystem_info(part, p); ++ else showDebug("%s", "actionlist::scan_partitions, get_partfilesystem_info ko\n"); ++ ++ /*---get the label of this primary partition---*/ ++ if (part) get_partfilesystem_label(part, p); ++ else showDebug("%s", "actionlist::scan_partitions, get_partfilesystem_label ko\n"); ++ } ++ } else { ++ QP_PartInfo *logi; ++ /*---loop for every logical partitions---*/ ++ for (logi = (QP_PartInfo*)orig_logilist.first(); logi; logi = (QP_PartInfo*)orig_logilist.next()) { ++ i++; ++ if (!logi->isFree()) { ++ /*---emit a signal for update the progressbar---*/ ++ _libparted->_message = QString(tr("Getting info about partition %1.")) ++ .arg(logi->partname()); ++ _libparted->emitSigTimer(i*100/totPart, _libparted->message(), QString::null); ++ ++ /*---get info about this logical partition---*/ ++ part = ped_disk_get_partition(disk(), logi->num); ++ if (part) get_partfilesystem_info(part, logi); ++ else showDebug("%s", "actionlist::scan_partitions, get_partfilesystem_info ko\n"); ++ ++ /*---get the label of this logical partition---*/ ++ if (part) get_partfilesystem_label(part, logi); ++ else showDebug("%s", "actionlist::scan_partitions, get_partfilesystem_label ko\n"); ++ } ++ } ++ } ++ } ++ ++ _libparted->emitSigTimer(100, _libparted->message(), QString::null); + } + + bool QP_ActionList::get_partfilesystem_info(PedPartition *part, QP_PartInfo *partinfo) { +- showDebug("%s", "actionlist::get_partfilesystem_info\n"); ++ showDebug("%s", "actionlist::get_partfilesystem_info\n"); ++ ++ /*---if the partition is virtual (ie change not committed) we cannot determinate ++ * how much the filesystem is fill---*/ ++ if (partinfo->_virtual) { ++ partinfo->min_size = -1; ++ return true; ++ } + +- /*---if the partition is virtual (ie change not committed) we cannot determinate +- * how much the filesystem is fill---*/ +- if (partinfo->_virtual) { +- partinfo->min_size = -1; +- return true; +- } +- +- /*---is the filesystem supported by parted?---*/ +- PedFileSystem *fs = ped_file_system_open(&part->geom); +- if (!fs) { +- /*---exist a wrapper for min_size?---*/ +- if (partinfo->fswrap() && partinfo->fsspec->fswrap()->wrap_min_size) { +- /*---get the min_size from the wrapper---*/ +- partinfo->min_size = partinfo->fsspec->fswrap()->min_size(partinfo->partname()); +- if (partinfo->min_size > (partinfo->end-partinfo->start)) partinfo->min_size=partinfo->end-partinfo->start; +- } +- else +- /*---get the min_size from space_stats (that is a "df" wrapper)---*/ +- partinfo->min_size = space_stats(partinfo); +- +- return true; +- } +- +- /*---get the minimum filesystem size---*/ +- PedConstraint *resize_constraint = ped_file_system_get_resize_constraint(fs); +- if (resize_constraint) { +- partinfo->min_size = resize_constraint->min_size; +- ped_constraint_destroy (resize_constraint); +- } ++ /*---is the filesystem supported by parted?---*/ ++ PedFileSystem *fs = ped_file_system_open(&part->geom); ++ if (!fs) { ++ /*---exist a wrapper for min_size?---*/ ++ if (partinfo->fswrap() && partinfo->fsspec->fswrap()->wrap_min_size) { ++ /*---get the min_size from the wrapper---*/ ++ partinfo->min_size = partinfo->fsspec->fswrap()->min_size(partinfo->partname()); ++ if (partinfo->min_size > (partinfo->end-partinfo->start)) partinfo->min_size=partinfo->end-partinfo->start; ++ } ++ else ++ /*---get the min_size from space_stats (that is a "df" wrapper)---*/ ++ partinfo->min_size = space_stats(partinfo); + +- ped_file_system_close(fs); ++ return true; ++ } ++ ++ /*---get the minimum filesystem size---*/ ++ PedConstraint *resize_constraint = ped_file_system_get_resize_constraint(fs); ++ if (resize_constraint) { ++ partinfo->min_size = resize_constraint->min_size; ++ ped_constraint_destroy (resize_constraint); ++ } + +- return true; ++ ped_file_system_close(fs); ++ ++ return true; + } + + bool QP_ActionList::get_partfilesystem_label(PedPartition *part, QP_PartInfo *partinfo) { +- if (partinfo->_virtual) +- return true; ++ if (partinfo->_virtual) ++ return true; + +- partinfo->_label = QP_FSWrap::get_label(part, partinfo->fsspec->name()); ++ partinfo->_label = QP_FSWrap::get_label(part, partinfo->fsspec->name()); + +- return true; ++ return true; + } + + void QP_ActionList::ins_resize(int num, +- PedSector start, +- PedSector end, +- PedGeometry geom, +- PedPartitionType part_type) { +- showDebug("%s", "actionlist::ins_resize\n"); +- +- QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::resize, num, start, end, +- geom, part_type); +- actlist.append(actlistitem); ++ PedSector start, ++ PedSector end, ++ PedGeometry geom, ++ PedPartitionType part_type) { ++ showDebug("%s", "actionlist::ins_resize\n"); ++ ++ QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::resize, num, start, end, ++ geom, part_type); ++ actlist.append(actlistitem); + +- ins_newdisk(); ++ ins_newdisk(); + } + + void QP_ActionList::ins_move(int num, +- PedSector start, +- PedSector end, +- PedGeometry geom, +- PedPartitionType part_type) { +- showDebug("%s", "actionlist::ins_move\n"); +- +- QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::move, num, start, end, +- geom, part_type); +- actlist.append(actlistitem); ++ PedSector start, ++ PedSector end, ++ PedGeometry geom, ++ PedPartitionType part_type) { ++ showDebug("%s", "actionlist::ins_move\n"); ++ ++ QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::move, num, start, end, ++ geom, part_type); ++ actlist.append(actlistitem); + +- ins_newdisk(); ++ ins_newdisk(); + } + + void QP_ActionList::ins_rm(int num) { +- showDebug("%s", "actionlist::ins_rm\n"); ++ showDebug("%s", "actionlist::ins_rm\n"); + +- QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::rm, num); +- actlist.append(actlistitem); ++ QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::rm, num); ++ actlist.append(actlistitem); + +- ins_newdisk(); ++ ins_newdisk(); + } + + void QP_ActionList::ins_mkfs(QP_FileSystemSpec *fsspec, int num, QString label, PedGeometry geom, PedPartitionType part_type) { +- showDebug("%s", "actionlist::ins_mkfs\n"); ++ showDebug("%s", "actionlist::ins_mkfs\n"); + +- QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::format, num, fsspec, label, geom, part_type); +- actlist.append(actlistitem); ++ QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::format, num, fsspec, label, geom, part_type); ++ actlist.append(actlistitem); + +- ins_newdisk(); ++ ins_newdisk(); + } + + void QP_ActionList::ins_mkpart(QTParted::partType type, +- PedSector start, +- PedSector end, +- QP_FileSystemSpec *fsspec, +- QString label, +- PedGeometry geom, +- PedPartitionType part_type) { +- showDebug("%s", "actionlist::ins_mkpart\n"); +- +- QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::create, type, +- start, end, fsspec, label, geom, part_type); +- actlist.append(actlistitem); ++ PedSector start, ++ PedSector end, ++ QP_FileSystemSpec *fsspec, ++ QString label, ++ PedGeometry geom, ++ PedPartitionType part_type) { ++ showDebug("%s", "actionlist::ins_mkpart\n"); ++ ++ QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::create, type, ++ start, end, fsspec, label, geom, part_type); ++ actlist.append(actlistitem); + +- ins_newdisk(); ++ ins_newdisk(); + } + + void QP_ActionList::ins_active(int num, bool active) { +- showDebug("%s", "actionlist::ins_active\n"); +- +- QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::active, num, active); +- actlist.append(actlistitem); ++ showDebug("%s", "actionlist::ins_active\n"); ++ ++ QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::active, num, active); ++ actlist.append(actlistitem); + +- ins_newdisk(); ++ ins_newdisk(); + } + + void QP_ActionList::ins_hidden(int num, bool hidden) { +- showDebug("%s", "actionlist::ins_hidden\n"); +- +- QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::hidden, num, hidden); +- actlist.append(actlistitem); ++ showDebug("%s", "actionlist::ins_hidden\n"); ++ ++ QP_ActListItem *actlistitem = new QP_ActListItem(QTParted::hidden, num, hidden); ++ actlist.append(actlistitem); + +- ins_newdisk(); ++ ins_newdisk(); + } + + void QP_ActionList::get_partinfo(QP_PartInfo *partinfo, PedPartition *part) { +- showDebug("%s", "actionlist::get_partinfo\n"); ++ showDebug("%s", "actionlist::get_partinfo\n"); + +- /*---loop for every action saved---*/ +- QP_ActListItem *pl; +- for (pl = (QP_ActListItem *)actlist.first(); pl; pl = (QP_ActListItem *)actlist.next()) { +- /*---if you saved a mkpart (Create) and the geometry match... man: we have a virtual!---*/ +- if ((pl->_action == QTParted::create) +- || (pl->_action == QTParted::resize) +- || (pl->_action == QTParted::move) +- || (pl->_action == QTParted::format)) { +- if ((part->geom.start == pl->_geom.start) +- && (part->geom.end == pl->_geom.end) +- && (part->geom.length == pl->_geom.length) +- && (part->type == pl->_part_type)) { +- partinfo->_virtual = true; +- +- if (pl->_action == QTParted::create) partinfo->fsspec = pl->_fsspec; +- if (pl->_action == QTParted::format) partinfo->fsspec = pl->_fsspec; +- } +- } +- } ++ /*---loop for every action saved---*/ ++ QP_ActListItem *pl; ++ for (pl = (QP_ActListItem *)actlist.first(); pl; pl = (QP_ActListItem *)actlist.next()) { ++ /*---if you saved a mkpart (Create) and the geometry match... man: we have a virtual!---*/ ++ if ((pl->_action == QTParted::create) ++ || (pl->_action == QTParted::resize) ++ || (pl->_action == QTParted::move) ++ || (pl->_action == QTParted::format)) { ++ if ((part->geom.start == pl->_geom.start) ++ && (part->geom.end == pl->_geom.end) ++ && (part->geom.length == pl->_geom.length) ++ && (part->type == pl->_part_type)) { ++ partinfo->_virtual = true; ++ ++ if (pl->_action == QTParted::create) partinfo->fsspec = pl->_fsspec; ++ if (pl->_action == QTParted::format) partinfo->fsspec = pl->_fsspec; ++ } ++ } ++ } + } + + bool QP_ActionList::canUndo() { +- return (listdisk.first() != listdisk.last()); ++ return (listdisk.first() != listdisk.last()); + } + + void QP_ActionList::undo() { +- showDebug("%s", "actionlist::undo\n"); ++ showDebug("%s", "actionlist::undo\n"); + +- /*---destroy the state of the disk in this moment---*/ +- ped_disk_destroy(_disk); ++ /*---destroy the state of the disk in this moment---*/ ++ ped_disk_destroy(_disk); + +- /*---undo last operation---*/ +- PedDisk *disk = (PedDisk *)listdisk.last(); +- ped_disk_destroy(disk); +- listdisk.removeLast(); ++ /*---undo last operation---*/ ++ PedDisk *disk = (PedDisk *)listdisk.last(); ++ ped_disk_destroy(disk); ++ listdisk.removeLast(); + +- /*---restore last state---*/ +- _disk = ped_disk_duplicate((PedDisk *)listdisk.last()); //FIXME: if !_disk :( +- if (!_disk) showDebug("%s", "actionlist::undo, ped_disk_duplicate ko\n"); ++ /*---restore last state---*/ ++ _disk = ped_disk_duplicate((PedDisk *)listdisk.last()); //FIXME: if !_disk :( ++ if (!_disk) showDebug("%s", "actionlist::undo, ped_disk_duplicate ko\n"); + +- /*---remove last operation---*/ +- actlist.removeLast(); ++ /*---remove last operation---*/ ++ actlist.removeLast(); + +- /*---the state of the disk... is of course changed---*/ +- emit sigDiskChanged(); ++ /*---the state of the disk... is of course changed---*/ ++ emit sigDiskChanged(); + } + + void QP_ActionList::commit() { +- showDebug("%s", "actionlist::commit\n"); ++ showDebug("%s", "actionlist::commit\n"); ++ ++ //messageState, used to keep "error message" returned by libparted ++ QString messageState = QString::null; ++ ++ /*---undo all disk state---*/ ++ while (listdisk.first() != listdisk.last()) { ++ PedDisk *disk = (PedDisk *)listdisk.last(); ++ ped_disk_destroy(disk); ++ listdisk.removeLast(); ++ } ++ _disk = ped_disk_duplicate((PedDisk *)listdisk.first()); ++ if (!_disk) showDebug("%s", "actionlist::commit, ped_disk_duplicate ko\n"); ++ ++ /*---commit the operations in "batch" mode---*/ ++ _libparted->setWrite(true); ++ ++ bool rc = true; ++ ++ //counter of how much operations are done! ++ int i = 0; ++ int iTotAct = actlist.count() + 1; ++ ++ QP_ActListItem *pl; ++ for (pl = (QP_ActListItem *)actlist.first(); pl; pl = (QP_ActListItem *)actlist.next()) { ++ showDebug("%s", "actionlist::commit, loop for commit\n"); ++ ++ //---mkpart commit--- ++ if (pl->_action == QTParted::create) { ++ showDebug("%s", "actionlist::commit, want to commit a create\n"); ++ emit sigOperations(tr("Creating partition."), messageState, i++, iTotAct); ++ if (!_libparted->mkpartfs(pl->_type, pl->_fsspec, pl->_start, pl->_end, pl->_label)) { ++ messageState = _libparted->message(); ++ rc = false; ++ } ++ } ++ //---rm commit--- ++ else if (pl->_action == QTParted::rm) { ++ showDebug("%s", "actionlist::commit, want to commit a rm\n"); ++ emit sigOperations(tr("Preparation for removing a partition."), messageState, i++, iTotAct); ++ scan_partitions(); ++ _libparted->scan_orig_partitions(); ++ ++ emit sigOperations(tr("Removing a partition."), messageState, i, iTotAct); ++ if (!_libparted->rm(pl->_num)) { ++ messageState = _libparted->message(); ++ rc = false; ++ } ++ } ++ //---resize commit--- ++ else if (pl->_action == QTParted::resize) { ++ showDebug("%s", "actionlist::commit, want to commit a resize\n"); ++ emit sigOperations(tr("Preparation for resizing a partition."), messageState, i++, iTotAct); ++ scan_partitions(); ++ _libparted->scan_orig_partitions(); ++ ++ emit sigOperations(tr("Resizing a partition."), messageState, i, iTotAct); ++ if (!_libparted->resize(pl->_num, pl->_start, pl->_end)) { ++ messageState = _libparted->message(); ++ rc = false; ++ } ++ } ++ //---move commit--- ++ else if (pl->_action == QTParted::move) { ++ showDebug("%s", "actionlist::commit, want to commit a move\n"); ++ emit sigOperations(tr("Preparation for moving a partition."), messageState, i++, iTotAct); ++ scan_partitions(); ++ _libparted->scan_orig_partitions(); ++ ++ emit sigOperations(tr("Moving a partition."), messageState, i, iTotAct); ++ if (!_libparted->move(pl->_num, pl->_start, pl->_end)) { ++ messageState = _libparted->message(); ++ rc = false; ++ } ++ } ++ //---active commit--- ++ else if (pl->_action == QTParted::active) { ++ showDebug("%s", "actionlist::commit, want to commit an active\n"); ++ emit sigOperations(tr("Preparation for activating a partition."), messageState, i++, iTotAct); ++ scan_partitions(); ++ _libparted->scan_orig_partitions(); ++ ++ emit sigOperations(tr("Activating a partition."), messageState, i, iTotAct); ++ if (!_libparted->partition_set_flag_active(pl->_num, pl->_status)) { ++ messageState = _libparted->message(); ++ rc = false; ++ } ++ } ++ //---active commit--- ++ else if (pl->_action == QTParted::hidden) { ++ showDebug("%s", "actionlist::commit, want to commit an hidden\n"); ++ emit sigOperations(tr("Preparation for hiding a partition."), messageState, i++, iTotAct); ++ scan_partitions(); ++ _libparted->scan_orig_partitions(); ++ ++ emit sigOperations(tr("Hiding a partition."), messageState, i, iTotAct); ++ if (!_libparted->partition_set_flag_hidden(pl->_num, pl->_status)) { ++ messageState = _libparted->message(); ++ rc = false; ++ } ++ } ++ //---active commit--- ++ else if (pl->_action == QTParted::format) { ++ showDebug("%s", "actionlist::commit, want to commit a format\n"); ++ emit sigOperations(tr("Preparation for formatting a partition."), messageState, i++, iTotAct); ++ scan_partitions(); ++ _libparted->scan_orig_partitions(); ++ ++ emit sigOperations(tr("Formatting a partition."), messageState, i, iTotAct); ++ if (!_libparted->mkfs(pl->_num, pl->_fsspec, pl->_label)) { ++ messageState = _libparted->message(); ++ rc = false; ++ } ++ } ++ ++ /*---just update GUI---*/ ++ qApp->processEvents(); ++ ++ if (rc == false) { ++ break; ++ } ++ } ++ ++ actlist.clear(); ++ ++ /*---return in test mode---*/ ++ _libparted->setWrite(false); ++ ++ /*---remove the disk used---*/ ++ ped_disk_destroy(_disk); ++ ++ /*---remove also the original disk---*/ ++ ped_disk_destroy((PedDisk *)listdisk.first()); ++ listdisk.clear(); + +- //messageState, used to keep "error message" returned by libparted +- QString messageState = QString::null; +- +- /*---undo all disk state---*/ +- while (listdisk.first() != listdisk.last()) { +- PedDisk *disk = (PedDisk *)listdisk.last(); +- ped_disk_destroy(disk); +- listdisk.removeLast(); +- } +- _disk = ped_disk_duplicate((PedDisk *)listdisk.first()); +- if (!_disk) showDebug("%s", "actionlist::commit, ped_disk_duplicate ko\n"); +- +- /*---commit the operations in "batch" mode---*/ +- _libparted->setWrite(true); +- +- bool rc = true; +- +- //counter of how much operations are done! +- int i = 0; +- int iTotAct = actlist.count() + 1; +- +- QP_ActListItem *pl; +- for (pl = (QP_ActListItem *)actlist.first(); pl; pl = (QP_ActListItem *)actlist.next()) { +- showDebug("%s", "actionlist::commit, loop for commit\n"); +- +- //---mkpart commit--- +- if (pl->_action == QTParted::create) { +- showDebug("%s", "actionlist::commit, want to commit a create\n"); +- emit sigOperations(tr("Creating partition."), messageState, i++, iTotAct); +- if (!_libparted->mkpartfs(pl->_type, pl->_fsspec, pl->_start, pl->_end, pl->_label)) { +- messageState = _libparted->message(); +- rc = false; +- } +- } +- //---rm commit--- +- else if (pl->_action == QTParted::rm) { +- showDebug("%s", "actionlist::commit, want to commit a rm\n"); +- emit sigOperations(tr("Preparation for removing a partition."), messageState, i++, iTotAct); +- scan_partitions(); +- _libparted->scan_orig_partitions(); +- +- emit sigOperations(tr("Removing a partition."), messageState, i, iTotAct); +- if (!_libparted->rm(pl->_num)) { +- messageState = _libparted->message(); +- rc = false; +- } +- } +- //---resize commit--- +- else if (pl->_action == QTParted::resize) { +- showDebug("%s", "actionlist::commit, want to commit a resize\n"); +- emit sigOperations(tr("Preparation for resizing a partition."), messageState, i++, iTotAct); +- scan_partitions(); +- _libparted->scan_orig_partitions(); +- +- emit sigOperations(tr("Resizing a partition."), messageState, i, iTotAct); +- if (!_libparted->resize(pl->_num, pl->_start, pl->_end)) { +- messageState = _libparted->message(); +- rc = false; +- } +- } +- //---move commit--- +- else if (pl->_action == QTParted::move) { +- showDebug("%s", "actionlist::commit, want to commit a move\n"); +- emit sigOperations(tr("Preparation for moving a partition."), messageState, i++, iTotAct); +- scan_partitions(); +- _libparted->scan_orig_partitions(); +- +- emit sigOperations(tr("Moving a partition."), messageState, i, iTotAct); +- if (!_libparted->move(pl->_num, pl->_start, pl->_end)) { +- messageState = _libparted->message(); +- rc = false; +- } +- } +- //---active commit--- +- else if (pl->_action == QTParted::active) { +- showDebug("%s", "actionlist::commit, want to commit an active\n"); +- emit sigOperations(tr("Preparation for activating a partition."), messageState, i++, iTotAct); +- scan_partitions(); +- _libparted->scan_orig_partitions(); +- +- emit sigOperations(tr("Activating a partition."), messageState, i, iTotAct); +- if (!_libparted->partition_set_flag_active(pl->_num, pl->_status)) { +- messageState = _libparted->message(); +- rc = false; +- } +- } +- //---active commit--- +- else if (pl->_action == QTParted::hidden) { +- showDebug("%s", "actionlist::commit, want to commit an hidden\n"); +- emit sigOperations(tr("Preparation for hiding a partition."), messageState, i++, iTotAct); +- scan_partitions(); +- _libparted->scan_orig_partitions(); +- +- emit sigOperations(tr("Hiding a partition."), messageState, i, iTotAct); +- if (!_libparted->partition_set_flag_hidden(pl->_num, pl->_status)) { +- messageState = _libparted->message(); +- rc = false; +- } +- } +- //---active commit--- +- else if (pl->_action == QTParted::format) { +- showDebug("%s", "actionlist::commit, want to commit a format\n"); +- emit sigOperations(tr("Preparation for formatting a partition."), messageState, i++, iTotAct); +- scan_partitions(); +- _libparted->scan_orig_partitions(); +- +- emit sigOperations(tr("Formatting a partition."), messageState, i, iTotAct); +- if (!_libparted->mkfs(pl->_num, pl->_fsspec, pl->_label)) { +- messageState = _libparted->message(); +- rc = false; +- } +- } +- +- /*---just update GUI---*/ +- qApp->processEvents(); +- +- if (rc == false) { +- break; +- } +- } +- +- actlist.clear(); +- +- /*---return in test mode---*/ +- _libparted->setWrite(false); +- +- /*---remove the disk used---*/ +- ped_disk_destroy(_disk); +- +- /*---remove also the original disk---*/ +- ped_disk_destroy((PedDisk *)listdisk.first()); +- listdisk.clear(); +- +- /*---prepare the list and the _disk---*/ +- PedDisk *disk = ped_disk_new(_libparted->dev); //FIXME !disk +- if (!disk) showDebug("%s", "actionlist::commit, ped_disk_new ko\n"); +- +- listdisk.append(disk); +- _disk = ped_disk_duplicate(disk); //FIXME !_disk +- if (!_disk) showDebug("%s", "actionlist::commit, ped_disk_duplicate ko\n"); +- +- emit sigOperations(tr("Rescan of the disk."), messageState, i, iTotAct); +- +- showDebug("%s", "actionlist::commit, call scan_partitions\n"); ++ /*---prepare the list and the _disk---*/ ++ PedDisk *disk = ped_disk_new(_libparted->dev); //FIXME !disk ++ if (!disk) showDebug("%s", "actionlist::commit, ped_disk_new ko\n"); ++ ++ listdisk.append(disk); ++ _disk = ped_disk_duplicate(disk); //FIXME !_disk ++ if (!_disk) showDebug("%s", "actionlist::commit, ped_disk_duplicate ko\n"); + +- /*---make a new scan of the partitions---*/ +- scan_partitions(); ++ emit sigOperations(tr("Rescan of the disk."), messageState, i, iTotAct); ++ ++ showDebug("%s", "actionlist::commit, call scan_partitions\n"); + +- emit sigOperations(tr("All operations completed."), messageState, iTotAct, iTotAct); ++ /*---make a new scan of the partitions---*/ ++ scan_partitions(); + +- /*---the state of the disk... is of course changed---*/ +- emit sigDiskChanged(); ++ emit sigOperations(tr("All operations completed."), messageState, iTotAct, iTotAct); ++ ++ /*---the state of the disk... is of course changed---*/ ++ emit sigDiskChanged(); + } + + PedDisk * QP_ActionList::disk() { +- return _disk; ++ return _disk; + } + + QP_PartInfo * QP_ActionList::partActive() { +- return _partActive; ++ return _partActive; + } + + /*---this will get if the partition has active flag (ie is bootable)---*/ + void QP_ActionList::partition_get_flags(QP_PartInfo *partinfo, PedPartition *part) { +- if (ped_partition_is_flag_available(part, PED_PARTITION_BOOT)) { +- partinfo->_canBeActive = true; +- bool active = bool(ped_partition_get_flag(part, PED_PARTITION_BOOT)); +- partinfo->_active = active; +- if (active) _partActive = partinfo; +- } +- +- if (ped_partition_is_flag_available(part, PED_PARTITION_HIDDEN)) { +- partinfo->_canBeHidden = true; +- bool hidden = bool(ped_partition_get_flag(part, PED_PARTITION_HIDDEN)); +- partinfo->_hidden = hidden; +- } ++ if (ped_partition_is_flag_available(part, PED_PARTITION_BOOT)) { ++ partinfo->_canBeActive = true; ++ bool active = bool(ped_partition_get_flag(part, PED_PARTITION_BOOT)); ++ partinfo->_active = active; ++ if (active) _partActive = partinfo; ++ } ++ ++ if (ped_partition_is_flag_available(part, PED_PARTITION_HIDDEN)) { ++ partinfo->_canBeHidden = true; ++ bool hidden = bool(ped_partition_get_flag(part, PED_PARTITION_HIDDEN)); ++ partinfo->_hidden = hidden; ++ } + } + + void QP_ActionList::ins_newdisk() { +- showDebug("%s", "actionlist::ins_newdisk\n"); ++ showDebug("%s", "actionlist::ins_newdisk\n"); + +- listdisk.append(_disk); +- _disk = ped_disk_duplicate(_disk); //FIXME !_disk +- if (!_disk) showDebug("%s", "actionlist::ins_newdisk, ped_disk_duplicate ko\n"); ++ listdisk.append(_disk); ++ _disk = ped_disk_duplicate(_disk); //FIXME !_disk ++ if (!_disk) showDebug("%s", "actionlist::ins_newdisk, ped_disk_duplicate ko\n"); + +- emit sigDiskChanged(); ++ emit sigDiskChanged(); + } +diff -Naur qtparted-0.4.5.orig/src/qp_actlist.h qtparted-0.4.5/src/qp_actlist.h +--- qtparted-0.4.5.orig/src/qp_actlist.h 2004-04-12 16:09:07.000000000 +0200 ++++ qtparted-0.4.5/src/qp_actlist.h 2005-10-15 12:35:30.000000000 +0200 +@@ -1,22 +1,22 @@ + /* +- qtparted - a frontend to libparted for manipulating disk partitions +- Copyright (C) 2002-2003 Vanni Brutto ++ qtparted - a frontend to libparted for manipulating disk partitions ++ Copyright (C) 2002-2003 Vanni Brutto + +- Vanni Brutto ++ Vanni Brutto + +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + /* About QP_ActList class +@@ -36,89 +36,87 @@ + + /* move, -> num, start, end + * resize, -> num, start, end +- * rm, -> num ++ * rm, -> num + * create -> start, end, tipo_estesa_logica, fsspec, label + * */ + class QP_ActListItem { + public: +- /*---type (move+resize), num, start, end, geometry, parttype---*/ +- QP_ActListItem(QTParted::actType, int, PedSector, PedSector, PedGeometry, PedPartitionType); ++ /*---type (move+resize), num, start, end, geometry, parttype---*/ ++ QP_ActListItem(QTParted::actType, int, PedSector, PedSector, PedGeometry, PedPartitionType); + +- /*---type, num (rm)---*/ +- QP_ActListItem(QTParted::actType, int); ++ /*---type, num (rm)---*/ ++ QP_ActListItem(QTParted::actType, int); + +- /*---type (format), num, fsspec, label, geometry, parttype---*/ +- QP_ActListItem(QTParted::actType, int, QP_FileSystemSpec *, QString, PedGeometry, PedPartitionType); ++ /*---type (format), num, fsspec, label, geometry, parttype---*/ ++ QP_ActListItem(QTParted::actType, int, QP_FileSystemSpec *, QString, PedGeometry, PedPartitionType); + +- /*---type, num, active---*/ +- QP_ActListItem(QTParted::actType, int, bool); +- +- /*---type, logical/extended, start, end, typoFS, label, geometry, parttype---*/ +- QP_ActListItem(QTParted::actType, +- QTParted::partType, +- PedSector, PedSector, +- QP_FileSystemSpec *, +- QString, +- PedGeometry, +- PedPartitionType); ++ /*---type, num, active---*/ ++ QP_ActListItem(QTParted::actType, int, bool); ++ ++ /*---type, logical/extended, start, end, typoFS, label, geometry, parttype---*/ ++ QP_ActListItem(QTParted::actType, ++ QTParted::partType, ++ PedSector, PedSector, ++ QP_FileSystemSpec *, ++ QString, ++ PedGeometry, ++ PedPartitionType); + + //private: +- QTParted::actType _action; +- PedSector _start; +- PedSector _end; +- int _num; +- QTParted::partType _type; +- QP_FileSystemSpec *_fsspec; +- QString _label; +- PedGeometry _geom; +- PedPartitionType _part_type; +- bool _status; //used for boot and hidden flags ++ QTParted::actType _action; ++ PedSector _start; ++ PedSector _end; ++ int _num; ++ QTParted::partType _type; ++ QP_FileSystemSpec *_fsspec; ++ QString _label; ++ PedGeometry _geom; ++ PedPartitionType _part_type; ++ bool _status; //used for boot and hidden flags + }; + + + class QP_ActionList : public QObject { +-friend class QP_LibParted; +-friend class QP_PartInfo; +-Q_OBJECT ++ friend class QP_LibParted; ++ friend class QP_PartInfo; ++ Q_OBJECT + public: +- QP_ActionList(QP_LibParted *); +- ~QP_ActionList(); +- void update_listpartitions(); +- void scan_partitions(); //scan for every partition +- bool get_partfilesystem_info(PedPartition *, QP_PartInfo *); +- bool get_partfilesystem_label(PedPartition *part, QP_PartInfo *partinfo); +- void ins_resize(int, PedSector, PedSector, PedGeometry, PedPartitionType); +- void ins_move(int, PedSector, PedSector, PedGeometry, PedPartitionType); +- void ins_rm(int); +- void ins_mkfs(QP_FileSystemSpec *, int, QString, PedGeometry, PedPartitionType); +- void ins_mkpart(QTParted::partType, PedSector, PedSector, QP_FileSystemSpec *, QString, PedGeometry, PedPartitionType); +- void ins_active(int, bool); +- void ins_hidden(int, bool); +- void get_partinfo(QP_PartInfo *, PedPartition *); +- bool canUndo(); //Does the user can undo/commit? +- void undo(); //undo last operation +- void commit(); //commit all operations +- PedDisk *disk(); //return the actual state of the disk +- QP_PartInfo *partActive(); //return the partinfo that is bootable +- QPtrList partlist; +- QPtrList logilist; ++ QP_ActionList(QP_LibParted *); ++ ~QP_ActionList(); ++ void update_listpartitions(); ++ void scan_partitions(); //scan for every partition ++ bool get_partfilesystem_info(PedPartition *, QP_PartInfo *); ++ bool get_partfilesystem_label(PedPartition *part, QP_PartInfo *partinfo); ++ void ins_resize(int, PedSector, PedSector, PedGeometry, PedPartitionType); ++ void ins_move(int, PedSector, PedSector, PedGeometry, PedPartitionType); ++ void ins_rm(int); ++ void ins_mkfs(QP_FileSystemSpec *, int, QString, PedGeometry, PedPartitionType); ++ void ins_mkpart(QTParted::partType, PedSector, PedSector, QP_FileSystemSpec *, QString, PedGeometry, PedPartitionType); ++ void ins_active(int, bool); ++ void ins_hidden(int, bool); ++ void get_partinfo(QP_PartInfo *, PedPartition *); ++ bool canUndo(); //Does the user can undo/commit? ++ void undo(); //undo last operation ++ void commit(); //commit all operations ++ PedDisk *disk(); //return the actual state of the disk ++ QP_PartInfo *partActive(); //return the partinfo that is bootable ++ QPtrList partlist; ++ QPtrList logilist; + + private: +- void partition_get_flags(QP_PartInfo *, PedPartition *); //will get the active flag +- void ins_newdisk(); +- QPtrList actlist; +- QPtrList listdisk; +- PedDisk *_disk; +- QP_LibParted *_libparted; +- QP_PartInfo *_partActive; //a pointer to the partinfo that is current active (ie bootable) +- QPtrList orig_partlist; +- QPtrList orig_logilist; ++ void partition_get_flags(QP_PartInfo *, PedPartition *); //will get the active flag ++ void ins_newdisk(); ++ QPtrList actlist; ++ QPtrList listdisk; ++ PedDisk *_disk; ++ QP_LibParted *_libparted; ++ QP_PartInfo *_partActive; //a pointer to the partinfo that is current active (ie bootable) ++ QPtrList orig_partlist; ++ QPtrList orig_logilist; + + signals: +- /*---emitted when the state of the disk was changed---*/ +- void sigDiskChanged(); +- void sigOperations(QString, QString, int, int); ++ /*---emitted when the state of the disk was changed---*/ ++ void sigDiskChanged(); ++ void sigOperations(QString, QString, int, int); + }; +- +- + #endif +diff -Naur qtparted-0.4.5.orig/src/qp_combospin.cpp qtparted-0.4.5/src/qp_combospin.cpp +--- qtparted-0.4.5.orig/src/qp_combospin.cpp 2003-08-27 18:13:18.000000000 +0200 ++++ qtparted-0.4.5/src/qp_combospin.cpp 2005-10-15 13:13:01.000000000 +0200 +@@ -24,50 +24,51 @@ + #include "qp_options.h" + + QP_ComboSpin::QP_ComboSpin(QWidget *parent, const char *name) +- :QWidget(parent, name) { +- layout = new QHBoxLayout(this); //, "layout"); +- +- spinbox = new QP_SpinBox(this, "spinbox"); +- spinbox->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, spinbox->sizePolicy().hasHeightForWidth())); +- +- layout->addWidget(spinbox); +- connect(spinbox, SIGNAL(valueChanged(PedSector)), +- this, SIGNAL(valueChanged(PedSector))); +- +- combobox = new QComboBox(false, this, "combobox"); +- combobox->setSizePolicy(QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, combobox->sizePolicy().hasHeightForWidth())); +- connect(combobox, SIGNAL(activated(int)), +- spinbox, SLOT(setFormat(int))); +- layout->addWidget(combobox); +- +- combobox->clear(); +- combobox->insertItem("MB"); +- combobox->insertItem("GB"); ++ :QWidget(parent, name) ++{ ++ layout = new QHBoxLayout(this); //, "layout"); ++ ++ spinbox = new QP_SpinBox(this, "spinbox"); ++ spinbox->setSizePolicy(QSizePolicy((QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, spinbox->sizePolicy().hasHeightForWidth())); ++ ++ layout->addWidget(spinbox); ++ connect(spinbox, SIGNAL(valueChanged(PedSector)), ++ this, SIGNAL(valueChanged(PedSector))); ++ ++ combobox = new QComboBox(false, this, "combobox"); ++ combobox->setSizePolicy(QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, combobox->sizePolicy().hasHeightForWidth())); ++ connect(combobox, SIGNAL(activated(int)), ++ spinbox, SLOT(setFormat(int))); ++ layout->addWidget(combobox); ++ ++ combobox->clear(); ++ combobox->insertItem("MB"); ++ combobox->insertItem("GB"); + } + + QP_ComboSpin::~QP_ComboSpin() { + } + + void QP_ComboSpin::setRange(PedSector min, PedSector max) { +- spinbox->setRange(min, max); ++ spinbox->setRange(min, max); + } + + void QP_ComboSpin::setValue(PedSector val) { +- spinbox->setValue(val); ++ spinbox->setValue(val); + } + + void QP_ComboSpin::setMaxValue(PedSector max) { +- spinbox->setMaxValue(max); ++ spinbox->setMaxValue(max); + } + + void QP_ComboSpin::setMinValue(PedSector min) { +- spinbox->setMinValue(min); ++ spinbox->setMinValue(min); + } + + PedSector QP_ComboSpin::value() { +- return spinbox->pedValue(); ++ return spinbox->pedValue(); + } + + PedSector QP_ComboSpin::maxValue() { +- return spinbox->pedMaxValue(); ++ return spinbox->pedMaxValue(); + } +diff -Naur qtparted-0.4.5.orig/src/qp_combospin.h qtparted-0.4.5/src/qp_combospin.h +--- qtparted-0.4.5.orig/src/qp_combospin.h 2003-08-27 18:13:19.000000000 +0200 ++++ qtparted-0.4.5/src/qp_combospin.h 2005-10-15 13:13:01.000000000 +0200 +@@ -33,24 +33,23 @@ + #define QP_COMBOSPIN_H + + class QP_ComboSpin : public QWidget { +-Q_OBJECT ++ Q_OBJECT + public: +- QP_ComboSpin(QWidget *parent = 0L, const char *name = 0L); +- ~QP_ComboSpin(); +- void setRange(PedSector, PedSector); +- void setMaxValue(PedSector); +- void setMinValue(PedSector); +- void setValue(PedSector); +- PedSector value(); +- PedSector maxValue(); ++ QP_ComboSpin(QWidget *parent = 0L, const char *name = 0L); ++ ~QP_ComboSpin(); ++ void setRange(PedSector, PedSector); ++ void setMaxValue(PedSector); ++ void setMinValue(PedSector); ++ void setValue(PedSector); ++ PedSector value(); ++ PedSector maxValue(); + + signals: +- void valueChanged(PedSector); ++ void valueChanged(PedSector); + + protected: +- QHBoxLayout *layout; +- QComboBox *combobox; +- QP_SpinBox *spinbox; ++ QHBoxLayout *layout; ++ QComboBox *combobox; ++ QP_SpinBox *spinbox; + }; +- + #endif +diff -Naur qtparted-0.4.5.orig/src/qp_fswrap.cpp qtparted-0.4.5/src/qp_fswrap.cpp +--- qtparted-0.4.5.orig/src/qp_fswrap.cpp 2005-07-06 23:29:54.000000000 +0200 ++++ qtparted-0.4.5/src/qp_fswrap.cpp 2006-04-05 01:45:50.000000000 +0200 +@@ -1,10 +1,9 @@ + /* + qtparted - a frontend to libparted for manipulating disk partitions + Copyright (C) 2002-2003 Vanni Brutto +- + Vanni Brutto + +- Copyright (C) 2005 Bernhard Rosenkraenzer ++ Copyright (C) 2005-2006 Bernhard Rosenkraenzer + bero (-at-) arklinux dot org + + This program is free software; you can redistribute it and/or modify +@@ -43,1108 +42,1161 @@ + + #define my_min(a,b) ((a)<(b) ? (a):(b)) + +-bool QP_FSWrap::fs_open(QString cmdline) { ++bool QP_FSWrap::fs_open(QString cmdline, bool localized) ++{ ++ ++ /*---this force stderr to stdout and a parsable language---*/ ++ QString dupcmdline = QString("%1 %2") ++ .arg(cmdline) ++ .arg(QString("2>&1")); ++ ++ if (!localized) ++ dupcmdline = "LC_ALL=POSIX " + dupcmdline; ++ ++ /*---open a pipe from the command line---*/ ++ fp = popen(dupcmdline, "r"); ++ ++ if (fp) ++ return true; ++ else ++ return false; ++} ++ ++char *QP_FSWrap::fs_getline() ++{ ++ bool rc = fgets(line, sizeof line, fp); ++ ++ if (rc) ++ return line; ++ else ++ return NULL; ++} ++ ++int QP_FSWrap::fs_close() ++{ ++ return fclose(fp); ++} ++ ++QP_FSWrap *QP_FSWrap::fswrap(QString name) ++{ ++ QP_FSWrap *fswrap; ++ ++ if (name.compare("ntfs") == 0) ++ fswrap = new QP_FSNtfs(); ++ else if (name.compare("jfs") == 0) ++ fswrap = new QP_FSJfs(); ++ else if (name.compare("ext3") == 0) ++ fswrap = new QP_FSExt3(); ++ else if (name.compare("xfs") == 0) ++ fswrap = new QP_FSXfs(); ++ else ++ fswrap = 0; + +- /*---this force stderr to stdout---*/ +- QString dupcmdline = QString("%1 %2") +- .arg(cmdline) +- .arg(QString("2>&1")); +- +- /*---open a pipe from the command line---*/ +- fp = popen(dupcmdline, "r"); +- +- if (fp) +- return true; +- else +- return false; +-} +- +-char * QP_FSWrap::fs_getline() { +- bool rc = fgets(line, sizeof line, fp); +- +- if (rc) return line; +- else return NULL; +-} +- +-int QP_FSWrap::fs_close() { +- return fclose(fp); +-} +- +-QP_FSWrap * QP_FSWrap::fswrap(QString name) { +- if (name.compare("ntfs") == 0) { +- QP_FSWrap *fswrap = new QP_FSNtfs(); +- return fswrap; +- } else +- if (name.compare("jfs") == 0) { +- QP_FSWrap *fswrap = new QP_FSJfs(); +- return fswrap; +- } else +- if (name.compare("ext3") == 0) { +- QP_FSWrap *fswrap = new QP_FSExt3(); +- return fswrap; +- } else +- if (name.compare("xfs") == 0) { +- QP_FSWrap *fswrap = new QP_FSXfs(); +- return fswrap; +- } +- else +- return NULL; +-} +- +-QString QP_FSWrap::get_label(PedPartition *part, QString name) { +- if (name.compare("ntfs") == 0) { +- return QP_FSNtfs::_get_label(part); +- } else +- if (name.compare("jfs") == 0) { +- return QP_FSJfs::_get_label(part); +- } else +- if (name.compare("ext3") == 0) { +- return QP_FSExt3::_get_label(part); +- } else +- if (name.compare("xfs") == 0) { +- return QP_FSXfs::_get_label(part); +- } +- if (name.compare("fat16") == 0) { +- return QP_FSFat16::_get_label(part); +- } +- if (name.compare("fat32") == 0) { +- return QP_FSFat32::_get_label(part); +- } +- if (name.compare("ext2") == 0) { +- return QP_FSExt2::_get_label(part); +- } +- if (name.compare("reiserfs") == 0) { +- return QP_FSReiserFS::_get_label(part); +- } +- else +- return QString::null; +-} +- +-bool QP_FSWrap::read_sector(PedPartition *part, PedSector offset, PedSector count, char *buffer) { +- /*---open a new device, read a sector and close it---*/ +- if (!ped_device_open(part->geom.dev)) +- return false; +- +- if (!ped_geometry_read(&part->geom, buffer, offset, count)) { +- ped_device_close (part->geom.dev); +- return false; +- } +- +- if (!ped_device_close(part->geom.dev)) +- return false; +- +- return true; +-} +- +-bool QP_FSWrap::qpMount(QString device) { +- char szcmdline[200]; +- bool error = false; +- +- /*---just to be sure! :)---*/ +- qpUMount(device); +- +- /*---mount the partition---*/ +- sprintf(szcmdline, "%s %s", device.latin1(), TMP_MOUNTPOINT); +- QString cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(MOUNT)) +- .arg(szcmdline); +- +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- char *cline; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- +- QRegExp rx; +- rx = QRegExp("^mount: (.*)$"); +- if (rx.search(line) == 0) { +- QString capError = rx.cap(1); +- _message = capError; +- error = true; +- } +- } +- fs_close(); +- +- return !error; +-} +- +-bool QP_FSWrap::qpUMount(QString device) { +- int ret = umount(device.latin1()); +- if(ret) { +- _message = QString(strerror(errno)); +- return false; +- } +- return true; ++ return fswrap; ++} ++ ++QString QP_FSWrap::get_label(PedPartition * part, QString name) ++{ ++ if (name.compare("ntfs") == 0) ++ return QP_FSNtfs::_get_label(part); ++ else if (name.compare("jfs") == 0) ++ return QP_FSJfs::_get_label(part); ++ else if (name.compare("ext3") == 0) ++ return QP_FSExt3::_get_label(part); ++ else if (name.compare("xfs") == 0) ++ return QP_FSXfs::_get_label(part); ++ else if (name.compare("fat16") == 0) ++ return QP_FSFat16::_get_label(part); ++ else if (name.compare("fat32") == 0) ++ return QP_FSFat32::_get_label(part); ++ else if (name.compare("ext2") == 0) ++ return QP_FSExt2::_get_label(part); ++ else if (name.compare("reiserfs") == 0) ++ return QP_FSReiserFS::_get_label(part); ++ else ++ return QString::null; ++} ++ ++bool QP_FSWrap::read_sector(PedPartition * part, PedSector offset, ++ PedSector count, char *buffer) ++{ ++ /*---open a new device, read a sector and close it---*/ ++ if (!ped_device_open(part->geom.dev)) ++ return false; ++ ++ if (!ped_geometry_read(&part->geom, buffer, offset, count)) { ++ ped_device_close(part->geom.dev); ++ return false; ++ } ++ ++ if (!ped_device_close(part->geom.dev)) ++ return false; ++ ++ return true; ++} ++ ++bool QP_FSWrap::qpMount(QString device) ++{ ++ bool error = false; ++ ++ /*---just to be sure! :)---*/ ++ qpUMount(device); ++ ++ /*---mount the partition---*/ ++ QString cmdline = lstExternalTools->getPath(MOUNT) + " " + device + " " + TMP_MOUNTPOINT; ++ ++ if (!fs_open(cmdline, true)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } ++ ++ char *cline; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ ++ QRegExp rx = QRegExp("^mount: (.*)$"); ++ if (rx.search(line) == 0) { ++ QString capError = rx.cap(1); ++ _message = capError; ++ error = true; ++ } ++ } ++ fs_close(); ++ ++ return !error; ++} ++ ++bool QP_FSWrap::qpUMount(QString device) ++{ ++ int ret = umount(device.latin1()); ++ if (ret) { ++ _message = QString(strerror(errno)); ++ return false; ++ } ++ return true; + } + + + + /*---NTFS WRAPPER-----------------------------------------------------------------*/ +-QP_FSNtfs::QP_FSNtfs() { +- wrap_resize = false; +- wrap_move = false; +- wrap_copy = false; +- wrap_create = false; +- wrap_min_size = false; +- +- /*---check if the wrapper is installed---*/ +- QString cmdline = QString("which %1") +- .arg(lstExternalTools->getPath(MKNTFS)); +- fs_open(cmdline); +- char *cline; +- while ((cline = fs_getline())) +- wrap_create = true; +- fs_close(); +- +- /*---check if the wrapper is installed---*/ +- cmdline = QString("which %1") +- .arg(lstExternalTools->getPath(NTFSRESIZE)); +- fs_open(cmdline); +- +- +- while ((cline = fs_getline())) { +- wrap_resize = RS_SHRINK | RS_ENLARGE; +- wrap_min_size = true; +- } +- fs_close(); +-} +- +-bool QP_FSNtfs::resize(QP_LibParted *_libparted, bool write, QP_PartInfo *partinfo, PedSector new_start, PedSector new_end) { +- /*---pointer to libparted---*/ +- QP_LibParted *libparted = _libparted; +- ++QP_FSNtfs::QP_FSNtfs() ++{ ++ wrap_resize = false; ++ wrap_move = false; ++ wrap_copy = false; ++ wrap_create = false; ++ wrap_min_size = false; ++ ++ /*---check if the wrapper is installed---*/ ++ QString cmdline = "which " + lstExternalTools->getPath(MKNTFS); ++ fs_open(cmdline); ++ char *cline; ++ while ((cline = fs_getline())) ++ wrap_create = true; ++ fs_close(); ++ ++ /*---check if the wrapper is installed---*/ ++ cmdline = "which " + lstExternalTools->getPath(NTFSRESIZE); ++ fs_open(cmdline); ++ ++ ++ while ((cline = fs_getline())) { ++ wrap_resize = RS_SHRINK | RS_ENLARGE; ++ wrap_min_size = true; ++ } ++ fs_close(); ++} ++ ++bool QP_FSNtfs::resize(QP_LibParted * _libparted, bool write, ++ QP_PartInfo * partinfo, PedSector new_start, ++ PedSector new_end) ++{ ++ /*---pointer to libparted---*/ ++ QP_LibParted *libparted = _libparted; ++ + showDebug("%s", "Resizing a filesystem using a wrapper\n"); + +- /*---the user want to shrink or enlarge the partition?---*/ +- /*---the user want to shrink!---*/ +- if (new_end < partinfo->end) { +- /*---update the filesystem---*/ +- showDebug("%s", "shrinking filesystem...\n"); +- if (!ntfsresize(write, partinfo->partname(), new_end - new_start - 4*MEGABYTE_SECTORS)) { +- showDebug("%s", "shrinking filesystem ko\n"); +- return false; +- } +- +- /*---and now update geometry of the partition---*/ +- showDebug("%s", "update geometry...\n"); +- if (!libparted->set_geometry(partinfo, new_start, new_end)) { +- showDebug("%s", "update geometry ko\n"); +- _message = libparted->message(); +- return false; +- } else { +- /*---if you are NOT committing then add in the undo/commit list---*/ +- if (!write) { +- showDebug("%s", "operation added to undo/commit list\n"); +- PedPartitionType parttype = libparted->type2parttype(partinfo->type); +- PedGeometry geom = libparted->get_geometry(partinfo); +- libparted->actlist->ins_resize(partinfo->num, new_start, new_end, geom, parttype); +- } +- return true; +- } +- /*---the user want to enlarge!---*/ +- } else { +- /*---cannot enlarge if we cannot change disk geometry!---*/ +- if (partinfo->device()->isBusy()) { +- showDebug("%s", "the device is busy, so you cannot enlarge it\n"); +- _message = tr("Cannot enlarge a partition if the disk device is busy"); +- return false; +- } +- +- /*---first se the geometry of the partition---*/ +- showDebug("%s", "update geometry...\n"); +- if (!libparted->set_geometry(partinfo, new_start, new_end)) { +- showDebug("%s", "update geometry ko\n"); +- _message = libparted->message(); +- return false; +- } else { +- /*---if you are NOT committing then add in the undo/commit list---*/ +- if (!write) { +- showDebug("%s", "operation added to undo/commit list\n"); +- PedPartitionType parttype = libparted->type2parttype(partinfo->type); +- PedGeometry geom = libparted->get_geometry(partinfo); +- libparted->actlist->ins_resize(partinfo->num, new_start, new_end, geom, parttype); +- } +- } +- +- if (write) { +- /*---and now update the filesystem!---*/ +- showDebug("%s", "enlarge filesystem...\n"); +- if (!ntfsresize(write, partinfo->partname(), new_end - new_start - 4*MEGABYTE_SECTORS)) { +- showDebug("%s", "enlarge filesystem ko\n"); +- return false; +- } else { +- return true; +- } +- } else { +- return true; +- } +- } +-} +- +-bool QP_FSNtfs::ntfsresize(bool write, QString dev, PedSector newsize) { +- char szcmdline[200]; +- +- /*---init of the error message---*/ +- _message = QString::null; +- +- /*---calculate size of the partition in bytes---*/ +- PedSector size = (PedSector)((newsize-1)*512); +- +- /*---read-only test---*/ +- sprintf(szcmdline, "-n -ff -s %lld %s", size, dev.latin1()); +- QString cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(NTFSRESIZE)) +- .arg(szcmdline); +- +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- bool error = false; +- char *cline; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- +- QRegExp rx; +- +- if (!error) { +- rx = QRegExp("^ERROR.*: (.*)"); +- if (rx.search(line) == 0) { +- QString captured = rx.cap(1); +- _message = QString(captured); +- error = true; +- } +- } +- +- if (!error) { +- rx = QRegExp("^The volume end is fragmented.*"); +- if (rx.search(line) == 0) { +- _message = QString("The partition is fragmented."); +- error = true; +- } +- } ++ /*---the user want to shrink or enlarge the partition?---*/ ++ /*---the user want to shrink!---*/ ++ if (new_end < partinfo->end) { ++ /*---update the filesystem---*/ ++ showDebug("%s", "shrinking filesystem...\n"); ++ if (!ntfsresize ++ (write, partinfo->partname(), ++ new_end - new_start - 4 * MEGABYTE_SECTORS)) { ++ showDebug("%s", "shrinking filesystem ko\n"); ++ return false; ++ } ++ ++ /*---and now update geometry of the partition---*/ ++ showDebug("%s", "update geometry...\n"); ++ if (!libparted->set_geometry(partinfo, new_start, new_end)) { ++ showDebug("%s", "update geometry ko\n"); ++ _message = libparted->message(); ++ return false; ++ } else { ++ /*---if you are NOT committing then add in the undo/commit list---*/ ++ if (!write) { ++ showDebug("%s", ++ "operation added to undo/commit list\n"); ++ PedPartitionType parttype = ++ libparted->type2parttype(partinfo-> ++ type); ++ PedGeometry geom = ++ libparted->get_geometry(partinfo); ++ libparted->actlist->ins_resize(partinfo-> ++ num, ++ new_start, ++ new_end, ++ geom, ++ parttype); ++ } ++ return true; ++ } ++ /*---the user wants to enlarge!---*/ ++ } else { ++ /*---cannot enlarge if we cannot change disk geometry!---*/ ++ if (partinfo->device()->isBusy()) { ++ showDebug("%s", ++ "the device is busy, so you cannot enlarge it\n"); ++ _message = tr( ++ "Cannot enlarge a partition if the disk device is busy"); ++ return false; ++ } ++ ++ /*---first se the geometry of the partition---*/ ++ showDebug("%s", "update geometry...\n"); ++ if (!libparted->set_geometry(partinfo, new_start, new_end)) { ++ showDebug("%s", "update geometry ko\n"); ++ _message = libparted->message(); ++ return false; ++ } else { ++ /*---if you are NOT committing then add in the undo/commit list---*/ ++ if (!write) { ++ showDebug("%s", ++ "operation added to undo/commit list\n"); ++ PedPartitionType parttype = ++ libparted->type2parttype(partinfo-> ++ type); ++ PedGeometry geom = ++ libparted->get_geometry(partinfo); ++ libparted->actlist->ins_resize(partinfo-> ++ num, ++ new_start, ++ new_end, ++ geom, ++ parttype); ++ } ++ } ++ ++ if (write) { ++ /*---and now update the filesystem!---*/ ++ showDebug("%s", "enlarge filesystem...\n"); ++ if (!ntfsresize ++ (write, partinfo->partname(), ++ new_end - new_start - 4 * MEGABYTE_SECTORS)) { ++ showDebug("%s", "enlarge filesystem ko\n"); ++ return false; ++ } else { ++ return true; ++ } ++ } else { ++ return true; ++ } ++ } ++} ++ ++bool QP_FSNtfs::ntfsresize(bool write, QString dev, PedSector newsize) ++{ ++ /*---init of the error message---*/ ++ _message = QString::null; ++ ++ /*---calculate size of the partition in bytes---*/ ++ PedSector size = (PedSector) ((newsize - 1) * 512); + +- /*---progress bar!---*/ +- QString linesub = line; ++ /*---read-only test---*/ ++ QString cmdline = lstExternalTools->getPath(NTFSRESIZE) + " " + ++ "-n -ff -s " + QString::number(size) + " " + dev; ++ ++ if (!fs_open(cmdline)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } ++ ++ bool error = false; ++ char *cline; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ ++ QRegExp rx; ++ ++ if (!error) { ++ rx = QRegExp("^ERROR.*: (.*)"); ++ if (rx.search(line) == 0) { ++ QString captured = rx.cap(1); ++ _message = QString(captured); ++ error = true; ++ } ++ } ++ ++ if (!error) { ++ rx = QRegExp("^The volume end is fragmented.*"); ++ if (rx.search(line) == 0) { ++ _message = ++ QString ++ ("The partition is fragmented."); ++ error = true; ++ } ++ } ++ ++ /*---progress bar!---*/ ++ QString linesub = line; + #ifdef QT30COMPATIBILITY +- linesub.replace(QRegExp("\r"), " "); ++ linesub.replace(QRegExp("\r"), " "); + #else +- linesub.replace(QChar('\r'), " "); ++ linesub.replace(QChar('\r'), " "); + #endif +- //example: 34,72 percent completed +- rx = QRegExp("^.* (\\d*),(\\d*) percent completed.*$"); +- if (rx.search(linesub) == 0) { +- QString capIntPercent = rx.cap(1); +- printf("letto: %s\n", capIntPercent.latin1()); +- //QString capFloatPercent = rx.cap(2); +- +- bool rc; +- int iPerc = capIntPercent.toInt(&rc) - 1; +- if (iPerc < 0) iPerc = 0; //the percente completed run many times, but i don't want it reach 100% +- +- emit sigTimer(iPerc, QString(tr("Resizing in progress.")), QString::null); +- } +- +- //BETA: change could with might with ntfsresize 1.9 +- //rx = QRegExp("^Now You could resize at \\d* bytes or (\\d*) .*"); +- rx = QRegExp("^.*You ..... resize at \\d* bytes or (\\d*) .*"); +- if (rx.search(line) == 0) { +- QString captured = rx.cap(1); +- _message = QString("The partition is fragmented. Try to defragment it, or resize to %1MB") +- .arg(captured); +- error = true; +- } +- } +- fs_close(); +- +- if (error) return false; +- +- /*---if the user want to run a readonly test just return true---*/ +- if (!write) return true; +- +- +- /*---ok, the readonly test seems ok... now we resize it!---*/ +- sprintf(szcmdline, "-ff -s %lld %s", size, dev.latin1()); +- cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(NTFSRESIZE)) +- .arg(szcmdline); +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- bool success = false; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- QRegExp rx; +- +- /*---progress bar!---*/ +- QString linesub = line; ++ //example: 34,72 percent completed ++ rx = QRegExp("^.* (\\d*),(\\d*) percent completed.*$"); ++ if (rx.search(linesub) == 0) { ++ QString capIntPercent = rx.cap(1); ++ printf("letto: %s\n", capIntPercent.latin1()); ++ //QString capFloatPercent = rx.cap(2); ++ ++ bool rc; ++ int iPerc = capIntPercent.toInt(&rc) - 1; ++ if (iPerc < 0) ++ iPerc = 0; //the percente completed run many times, but i don't want it reach 100% ++ ++ emit sigTimer(iPerc, ++ QString(tr("Resizing in progress.")), ++ QString::null); ++ } ++ //BETA: change could with might with ntfsresize 1.9 ++ //rx = QRegExp("^Now You could resize at \\d* bytes or (\\d*) .*"); ++ rx = QRegExp("^.*You ..... resize at \\d* bytes or (\\d*) .*"); ++ if (rx.search(line) == 0) { ++ QString captured = rx.cap(1); ++ _message = QString("The partition is fragmented. Try to defragment it, or resize to %1MB") ++ .arg(captured); ++ error = true; ++ } ++ } ++ fs_close(); ++ ++ if (error) ++ return false; ++ ++ /*---if the user want to run a readonly test just return true---*/ ++ if (!write) ++ return true; ++ ++ ++ /*---ok, the readonly test seems ok... now we resize it!---*/ ++ cmdline = lstExternalTools->getPath(NTFSRESIZE) + " -ff -s " + QString::number(size) + " " + dev; ++ if (!fs_open(cmdline)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } ++ ++ bool success = false; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ QRegExp rx; ++ ++ /*---progress bar!---*/ ++ QString linesub = line; + #ifdef QT30COMPATIBILITY +- linesub.replace(QRegExp("\r"), " "); ++ linesub.replace(QRegExp("\r"), " "); + #else +- linesub.replace(QChar('\r'), " "); ++ linesub.replace(QChar('\r'), " "); + #endif +- //example: 34,72 percent completed +- rx = QRegExp("^.* (\\d*),(\\d*) percent completed.*$"); +- if (rx.search(linesub) == 0) { +- QString capIntPercent = rx.cap(1); +- //QString capFloatPercent = rx.cap(2); +- +- bool rc; +- int iPerc = capIntPercent.toInt(&rc) - 1; +- if (iPerc < 0) iPerc = 0; //the percente completed run many times, but i don't want it reach 100% +- +- emit sigTimer(iPerc, QString(tr("Resizing in progress.")), QString::null); +- } +- +- //rx = QRegExp("^Successfully resized NTFS on device"); +- rx = QRegExp("^.*[Ss]uccessfully.*"); +- if (rx.search(line) == 0) +- success = true; +- rx = QRegExp("^Nothing to do: NTFS volume size is already OK."); +- if (rx.search(line) == 0) +- success = true; +- +- rx = QRegExp("^Syncing device.*"); +- if (rx.search(line) == 0) { +- emit sigTimer(99, QString(tr("Syncing device.")), QString::null); +- } +- +- rx = QRegExp("^ERROR.*: (.*)"); +- if (rx.search(line) == 0) { +- QString captured = rx.cap(1); +- _message = QString(captured); +- } +- } +- fs_close(); +- +- if (success) return true; +- else { +- if (_message.isNull()) _message = QString("An error occured! :("); +- return false; +- } +-} +- +-bool QP_FSNtfs::mkpartfs(QString dev, QString label) { +- char szcmdline[200]; +- QString cmdline; +- +- /*---init of the error message---*/ +- _message = QString::null; +- +- /*---prepare the command line---*/ +- if (label.isEmpty()) +- sprintf(szcmdline, "-f -s 512 %s", dev.latin1()); +- else +- sprintf(szcmdline, "-f -s 512 -L %s %s", label.latin1(), dev.latin1()); +- cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(MKNTFS)) +- .arg(szcmdline); +- +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- +- bool success = false; +- char *cline; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- +- QRegExp rx; +- rx = QRegExp("^mkntfs completed successfully. Have a nice day."); +- if (rx.search(line) == 0) +- success = true; +- +- rx = QRegExp("^ERROR.*: (.*)"); +- if (rx.search(line) == 0) { +- QString captured = rx.cap(1); +- _message = QString(captured); +- success = false; +- } +- } +- fs_close(); +- +- return success; +-} +- +-PedSector QP_FSNtfs::min_size(QString dev) { +- char szcmdline[200]; +- QString cmdline; +- PedSector size = -1; +- +- /*---init of the error message---*/ +- _message = QString::null; +- +- /*---prepare the command line---*/ +- sprintf(szcmdline, "-f -i %s", dev.latin1()); +- cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(NTFSRESIZE)) +- .arg(szcmdline); +- +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- +- bool success = false; +- char *cline; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- +- QRegExp rx; +- rx = QRegExp("^.*You ..... resize at (\\d*) bytes or (\\d*) .*"); +- if (rx.search(line) == 0) { +- QString captured = rx.cap(1); +- sscanf(captured.latin1(), "%lld", &size); +- size/=512; +- size+=8*MEGABYTE_SECTORS; +- +- success = true; +- } +- } +- fs_close(); ++ //example: 34,72 percent completed ++ rx = QRegExp("^.* (\\d*),(\\d*) percent completed.*$"); ++ if (rx.search(linesub) == 0) { ++ QString capIntPercent = rx.cap(1); ++ //QString capFloatPercent = rx.cap(2); ++ ++ bool rc; ++ int iPerc = capIntPercent.toInt(&rc) - 1; ++ if (iPerc < 0) ++ iPerc = 0; //the percente completed run many times, but i don't want it reach 100% ++ ++ emit sigTimer(iPerc, ++ QString(tr("Resizing in progress.")), ++ QString::null); ++ } ++ //rx = QRegExp("^Successfully resized NTFS on device"); ++ rx = QRegExp("^.*[Ss]uccessfully.*"); ++ if (rx.search(line) == 0) ++ success = true; ++ rx = QRegExp("^Nothing to do: NTFS volume size is already OK."); ++ if (rx.search(line) == 0) ++ success = true; ++ ++ rx = QRegExp("^Syncing device.*"); ++ if (rx.search(line) == 0) { ++ emit sigTimer(99, QString(tr("Syncing device.")), ++ QString::null); ++ } ++ ++ rx = QRegExp("^ERROR.*: (.*)"); ++ if (rx.search(line) == 0) { ++ QString captured = rx.cap(1); ++ _message = QString(captured); ++ } ++ } ++ fs_close(); + +- return size; ++ if (success) ++ return true; ++ else { ++ if (_message.isNull()) ++ _message = QString("An error occured! :("); ++ return false; ++ } + } + +-QString QP_FSNtfs::fsname() { +- return QString("ntfs"); ++bool QP_FSNtfs::mkpartfs(QString dev, QString label) ++{ ++ QString cmdline; ++ ++ /*---init of the error message---*/ ++ _message = QString::null; ++ ++ /*---prepare the command line---*/ ++ if (label.isEmpty()) ++ cmdline = " -f -s 512 " + dev; ++ else ++ cmdline = " -f -s 512 -L " + label + " " + dev; ++ cmdline = lstExternalTools->getPath(MKNTFS) + cmdline; ++ ++ if (!fs_open(cmdline)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } ++ ++ ++ bool success = false; ++ char *cline; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ ++ QRegExp rx; ++ rx = QRegExp("^mkntfs completed successfully. Have a nice day."); ++ if (rx.search(line) == 0) ++ success = true; ++ ++ rx = QRegExp("^ERROR.*: (.*)"); ++ if (rx.search(line) == 0) { ++ QString captured = rx.cap(1); ++ _message = QString(captured); ++ success = false; ++ } ++ } ++ fs_close(); ++ ++ return success; ++} ++ ++PedSector QP_FSNtfs::min_size(QString dev) ++{ ++ PedSector size = -1; ++ ++ /*---init of the error message---*/ ++ _message = QString::null; ++ ++ /*---prepare the command line---*/ ++ QString cmdline = lstExternalTools->getPath(NTFSRESIZE) + " -f -i " + dev; ++ ++ if (!fs_open(cmdline)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } ++ ++ ++ bool success = false; ++ char *cline; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ ++ QRegExp rx; ++ rx = QRegExp("^.*You ..... resize at (\\d*) bytes or (\\d*) .*"); ++ if (rx.search(line) == 0) { ++ QString captured = rx.cap(1); ++ sscanf(captured.latin1(), "%lld", &size); ++ size /= 512; ++ size += 8 * MEGABYTE_SECTORS; ++ ++ success = true; ++ } ++ } ++ fs_close(); ++ ++ return size; ++} ++ ++QString QP_FSNtfs::fsname() ++{ ++ return QString("ntfs"); + } + + /*QString QP_FSNtfs::_get_label(PedPartition *) { +- return QString::null; ++ return QString::null; + }*/ + + + + /*---JFS WRAPPER-----------------------------------------------------------------*/ +-QP_FSJfs::QP_FSJfs() { +- wrap_resize = RS_ENLARGE; +- wrap_move = false; +- wrap_copy = false; +- wrap_create = false; +- wrap_min_size = false; +- +- /*---check if the wrapper is installed---*/ +- QString cmdline = QString("which %1") +- .arg(lstExternalTools->getPath(MKFS_JFS)); +- fs_open(cmdline); +- +- char *cline; +- while ((cline = fs_getline())) +- wrap_create = true; +- fs_close(); +- +-} +- +-bool QP_FSJfs::resize(QP_LibParted *_libparted, bool write, QP_PartInfo *partinfo, PedSector new_start, PedSector new_end) { +- /*---pointer to libparted---*/ +- QP_LibParted *libparted = _libparted; +- +- showDebug("%s", "Resizing a filesystem using a wrapper\n"); +- +- /*---the user want to shrink or enlarge the partition?---*/ +- /*---the user want to shrink!---*/ +- if (new_end < partinfo->end) { +- /*---update the filesystem---*/ +- showDebug("%s", "shrinking filesystem not supported with jfs...\n"); +- return false; +- /*---the user want to enlarge!---*/ +- } else { +- /*---cannot enlarge if we cannot change disk geometry!---*/ +- if (partinfo->device()->isBusy()) { +- showDebug("%s", "the device is busy, so you cannot enlarge it\n"); +- _message = tr("Cannot enlarge a partition if the disk device is busy"); +- return false; +- } +- +- /*---first se the geometry of the partition---*/ +- showDebug("%s", "update geometry...\n"); +- if (!libparted->set_geometry(partinfo, new_start, new_end)) { +- showDebug("%s", "update geometry ko\n"); +- _message = libparted->message(); +- return false; +- } else { +- /*---if you are NOT committing then add in the undo/commit list---*/ +- if (!write) { +- showDebug("%s", "operation added to undo/commit list\n"); +- PedPartitionType parttype = libparted->type2parttype(partinfo->type); +- PedGeometry geom = libparted->get_geometry(partinfo); +- libparted->actlist->ins_resize(partinfo->num, new_start, new_end, geom, parttype); +- } +- } +- +- if (write) { +- /*---and now update the filesystem!---*/ +- showDebug("%s", "enlarge filesystem...\n"); +- if (!jfsresize(write, partinfo, new_end - new_start)) { +- showDebug("%s", "enlarge filesystem ko\n"); +- return false; +- } else { +- return true; +- } +- } else { +- return true; +- } +- } +-} +- +-bool QP_FSJfs::jfsresize(bool write, QP_PartInfo *partinfo, PedSector) { +- char szcmdline[200]; +- QString cmdline; +- +- bool error = false; +- +- if (!write) return true; +- +- /*---init of the error message---*/ +- _message = QString::null; +- +- if (!qpMount(partinfo->partname())) +- return false; +- +- +- /*---do the resize!---*/ +- sprintf(szcmdline, "-o remount,resize= %s", TMP_MOUNTPOINT); +- cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(MOUNT)) +- .arg(szcmdline); +- +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- char *cline; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- +- QRegExp rx; +- rx = QRegExp("^mount: (.*)$"); +- if (rx.search(line) == 0) { +- QString capError = rx.cap(1); +- _message = capError; +- error = true; +- } +- } +- fs_close(); +- +- if (error) return false; +- +- if (!qpUMount(partinfo->partname())) +- return false; +- +- return true; +- /*fino a qui*/ +-} +- +-bool QP_FSJfs::mkpartfs(QString dev, QString label) { +- char szcmdline[200]; +- QString cmdline; +- +- /*---init of the error message---*/ +- _message = QString::null; +- +- /*---prepare the command line---*/ +- if (label.isEmpty()) +- sprintf(szcmdline, "-q %s", dev.latin1()); +- else +- sprintf(szcmdline, "-q -L %s %s", label.latin1(), dev.latin1()); +- cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(MKFS_JFS)) +- .arg(szcmdline); +- +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- +- bool success = false; +- char *cline; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- +- QRegExp rx; +- rx = QRegExp("^Format completed successfully."); +- if (rx.search(line) == 0) +- success = true; +- } +- fs_close(); +- +- return success; +-} +- +-QString QP_FSJfs::fsname() { +- return QString("jfs"); +-} +- +-QString QP_FSJfs::_get_label(PedPartition *part) +-{ +- char bootsect[2048]; +- char label[12]; +- +- if (!QP_FSWrap::read_sector(part, 64, 4, bootsect)) +- return QString::null; +- +- memset(label, 0, sizeof(label)); +- strncpy(label, bootsect+101, 11); +- +- return QString(label); ++QP_FSJfs::QP_FSJfs() ++{ ++ wrap_resize = RS_ENLARGE; ++ wrap_move = false; ++ wrap_copy = false; ++ wrap_create = false; ++ wrap_min_size = false; ++ ++ /*---check if the wrapper is installed---*/ ++ QString cmdline = "which " + lstExternalTools->getPath(MKFS_JFS); ++ fs_open(cmdline); ++ ++ char *cline; ++ while ((cline = fs_getline())) ++ wrap_create = true; ++ fs_close(); ++ ++} ++ ++bool QP_FSJfs::resize(QP_LibParted * _libparted, bool write, ++ QP_PartInfo * partinfo, PedSector new_start, ++ PedSector new_end) ++{ ++ /*---pointer to libparted---*/ ++ QP_LibParted *libparted = _libparted; ++ ++ showDebug("%s", "Resizing a filesystem using a wrapper\n"); ++ ++ /*---the user wants to shrink or enlarge the partition?---*/ ++ /*---the user wants to shrink!---*/ ++ if (new_end < partinfo->end) { ++ /*---update the filesystem---*/ ++ showDebug("%s", ++ "shrinking filesystem not supported with jfs...\n"); ++ return false; ++ /*---the user want to enlarge!---*/ ++ } else { ++ /*---cannot enlarge if we cannot change disk geometry!---*/ ++ if (partinfo->device()->isBusy()) { ++ showDebug("%s", ++ "the device is busy, so you cannot enlarge it\n"); ++ _message = tr("Cannot enlarge a partition if the disk device is busy"); ++ return false; ++ } ++ ++ /*---first se the geometry of the partition---*/ ++ showDebug("%s", "update geometry...\n"); ++ if (!libparted->set_geometry(partinfo, new_start, new_end)) { ++ showDebug("%s", "update geometry ko\n"); ++ _message = libparted->message(); ++ return false; ++ } else { ++ /*---if you are NOT committing then add in the undo/commit list---*/ ++ if (!write) { ++ showDebug("%s", ++ "operation added to undo/commit list\n"); ++ PedPartitionType parttype = ++ libparted->type2parttype(partinfo-> ++ type); ++ PedGeometry geom = ++ libparted->get_geometry(partinfo); ++ libparted->actlist->ins_resize(partinfo-> ++ num, ++ new_start, ++ new_end, ++ geom, ++ parttype); ++ } ++ } ++ ++ if (write) { ++ /*---and now update the filesystem!---*/ ++ showDebug("%s", "enlarge filesystem...\n"); ++ if (!jfsresize ++ (write, partinfo, new_end - new_start)) { ++ showDebug("%s", "enlarge filesystem ko\n"); ++ return false; ++ } else { ++ return true; ++ } ++ } else { ++ return true; ++ } ++ } ++} ++ ++bool QP_FSJfs::jfsresize(bool write, QP_PartInfo * partinfo, PedSector) ++{ ++ QString cmdline; ++ ++ bool error = false; ++ ++ if (!write) ++ return true; ++ ++ /*---init of the error message---*/ ++ _message = QString::null; ++ ++ if (!qpMount(partinfo->partname())) ++ return false; ++ ++ ++ /*---do the resize!---*/ ++ cmdline = lstExternalTools->getPath(MOUNT) + " -o remount,resize= " + TMP_MOUNTPOINT; ++ ++ if (!fs_open(cmdline)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } ++ ++ char *cline; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ ++ QRegExp rx; ++ rx = QRegExp("^mount: (.*)$"); ++ if (rx.search(line) == 0) { ++ QString capError = rx.cap(1); ++ _message = capError; ++ error = true; ++ } ++ } ++ fs_close(); ++ ++ if (error) ++ return false; ++ ++ if (!qpUMount(partinfo->partname())) ++ return false; ++ ++ return true; ++ /*fino a qui */ ++} ++ ++bool QP_FSJfs::mkpartfs(QString dev, QString label) ++{ ++ QString cmdline; ++ ++ /*---init of the error message---*/ ++ _message = QString::null; ++ ++ /*---prepare the command line---*/ ++ if (label.isEmpty()) ++ cmdline = " -q " + dev; ++ else ++ cmdline = " -q -L " + label + " " + dev; ++ cmdline = lstExternalTools->getPath(MKFS_JFS) + cmdline; ++ ++ if (!fs_open(cmdline)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } ++ ++ ++ bool success = false; ++ char *cline; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ ++ QRegExp rx; ++ rx = QRegExp("^Format completed successfully."); ++ if (rx.search(line) == 0) ++ success = true; ++ } ++ fs_close(); ++ ++ return success; ++} ++ ++QString QP_FSJfs::fsname() ++{ ++ return QString("jfs"); ++} ++ ++QString QP_FSJfs::_get_label(PedPartition * part) ++{ ++ char bootsect[2048]; ++ char label[12]; ++ ++ if (!QP_FSWrap::read_sector(part, 64, 4, bootsect)) ++ return QString::null; ++ ++ memset(label, 0, sizeof(label)); ++ strncpy(label, bootsect + 101, 11); ++ ++ return QString(label); + } + + /*---EXT3 WRAPPER----------------------------------------------------------------*/ +-QP_FSExt3::QP_FSExt3() { +- wrap_min_size = false; +- wrap_resize = false; +- wrap_move = false; +- wrap_copy = false; +- wrap_create = false; +- +- /*---check if the wrapper is installed---*/ +- QString cmdline = QString("which %1") +- .arg(lstExternalTools->getPath(MKFS_EXT3)); +- fs_open(cmdline); +- +- char *cline; +- while ((cline = fs_getline())) +- wrap_create = true; +- fs_close(); +- +-} +- +-bool QP_FSExt3::mkpartfs(QString dev, QString label) { +- char szcmdline[200]; +- QString cmdline; +- +- /*---init of the error message---*/ +- _message = QString::null; +- +- /*---prepare the command line---*/ +- if (label.isEmpty()) +- sprintf(szcmdline, "%s", dev.latin1()); +- else +- sprintf(szcmdline, "-L %s %s", label.latin1(), dev.latin1()); +- cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(MKFS_EXT3)) +- .arg(szcmdline); +- +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- +- bool writenode = false; +- bool success = false; +- char *cline; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- +- QRegExp rx; +- rx = QRegExp("^Writing inode tables"); +- if (rx.search(line) == 0) { +- writenode = true; +- } +- +- rx = QRegExp("^Creating journal"); +- if (rx.search(line) == 0) { +- writenode = false; +- emit sigTimer(90, QString(tr("Writing superblocks and filesystem.")), QString::null); +- } ++QP_FSExt3::QP_FSExt3() ++{ ++ wrap_min_size = false; ++ wrap_resize = false; ++ wrap_move = false; ++ wrap_copy = false; ++ wrap_create = false; ++ ++ /*---check if the wrapper is installed---*/ ++ QString cmdline = "which " + lstExternalTools->getPath(MKFS_EXT3); ++ fs_open(cmdline); ++ ++ char *cline; ++ while ((cline = fs_getline())) ++ wrap_create = true; ++ fs_close(); ++ ++} ++ ++bool QP_FSExt3::mkpartfs(QString dev, QString label) ++{ ++ QString cmdline; ++ ++ /*---init of the error message---*/ ++ _message = QString::null; ++ ++ /*---prepare the command line---*/ ++ if (!label.isEmpty()) ++ cmdline = " -L " + label; ++ cmdline = lstExternalTools->getPath(MKFS_EXT3) + cmdline + " " + dev; ++ ++ if (!fs_open(cmdline)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } + +- if (writenode) { +- QString linesub = line; ++ ++ bool writenode = false; ++ bool success = false; ++ char *cline; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ ++ QRegExp rx; ++ rx = QRegExp("^Writing inode tables"); ++ if (rx.search(line) == 0) { ++ writenode = true; ++ } ++ ++ rx = QRegExp("^Creating journal"); ++ if (rx.search(line) == 0) { ++ writenode = false; ++ emit sigTimer(90, ++ QString(tr ++ ("Writing superblocks and filesystem.")), ++ QString::null); ++ } ++ ++ if (writenode) { ++ QString linesub = line; + + #ifdef QT30COMPATIBILITY +- linesub.replace(QRegExp("\b"), " "); ++ linesub.replace(QRegExp("\b"), " "); + #else +- linesub.replace(QChar('\b'), " "); ++ linesub.replace(QChar('\b'), " "); + #endif +- rx = QRegExp("^.* (\\d*)/(\\d*) .*$"); +- if (rx.search(linesub) == 0) { +- QString capActual = rx.cap(1); +- QString capTotal = rx.cap(2); +- +- bool rc; +- int iActual = capActual.toInt(&rc); +- int iTotal = capTotal.toInt(&rc); ++ rx = QRegExp("^.* (\\d*)/(\\d*) .*$"); ++ if (rx.search(linesub) == 0) { ++ QString capActual = rx.cap(1); ++ QString capTotal = rx.cap(2); ++ ++ bool rc; ++ int iActual = capActual.toInt(&rc); ++ int iTotal = capTotal.toInt(&rc); ++ ++ int iPerc = iActual * 80 / iTotal; //The percentual is calculated in 80% ;) ++ emit sigTimer(iPerc, ++ QString(tr ++ ("Writing inode tables.")), ++ QString::null); ++ } ++ } ++ ++ rx = QRegExp("^Writing superblocks and filesystem accounting information: done"); ++ if (rx.search(line) == 0) ++ success = true; ++ } ++ fs_close(); + +- int iPerc = iActual*80/iTotal; //The percentual is calculated in 80% ;) +- emit sigTimer(iPerc, QString(tr("Writing inode tables.")), QString::null); +- } +- } ++ if (!success) ++ _message = QString(tr("There was a problem with mkfs.ext3.")); + +- rx = QRegExp("^Writing superblocks and filesystem accounting information: done"); +- if (rx.search(line) == 0) +- success = true; +- } +- fs_close(); ++ return success; ++} + +- if (!success) _message = QString(tr("There was a problem with mkfs.ext3.")); ++QString QP_FSExt3::fsname() ++{ ++ return QString("ext3"); ++} + +- return success; ++QString QP_FSExt3::_get_label(PedPartition * p) ++{ ++ return QP_FSExt2::_get_label(p); ++ //return QString::null; + } + +-QString QP_FSExt3::fsname() { +- return QString("ext3"); ++/*---XFS WRAPPER-----------------------------------------------------------------*/ ++QP_FSXfs::QP_FSXfs() ++{ ++ wrap_min_size = false; ++ wrap_resize = false; ++ wrap_move = false; ++ wrap_copy = false; ++ wrap_create = false; ++ ++ /*---check if the wrapper is installed---*/ ++ QString cmdline = "which " + lstExternalTools->getPath(MKFS_XFS); ++ fs_open(cmdline); ++ ++ char *cline; ++ while ((cline = fs_getline())) ++ wrap_create = true; ++ fs_close(); ++ ++ ++ /*---check if the wrapper is installed---*/ ++ cmdline = "which " + lstExternalTools->getPath(XFS_GROWFS); ++ fs_open(cmdline); ++ ++ while ((cline = fs_getline())) ++ wrap_resize = RS_ENLARGE; ++ fs_close(); + } + +-QString QP_FSExt3::_get_label(PedPartition *p) ++bool QP_FSXfs::mkpartfs(QString dev, QString label) + { +- return QP_FSExt2::_get_label(p); +- //return QString::null; ++ QString cmdline; ++ ++ /*---init of the error message---*/ ++ _message = QString::null; ++ ++ /*---prepare the command line---*/ ++ if (label.isEmpty()) ++ cmdline = " -f " + dev; ++ else ++ cmdline = " -f -L " + label + " " + dev; ++ cmdline = lstExternalTools->getPath(MKFS_XFS) + cmdline; ++ ++ if (!fs_open(cmdline)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } ++ ++ bool success = false; ++ char *cline; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ ++ QRegExp rx; ++ rx = QRegExp("^realtime =.*"); ++ if (rx.search(line) == 0) ++ success = true; ++ } ++ fs_close(); ++ ++ if (!success) ++ _message = QString(tr("There was a problem with mkfs.xfs.")); ++ return success; + } + +-/*---XFS WRAPPER-----------------------------------------------------------------*/ +-QP_FSXfs::QP_FSXfs() { +- wrap_min_size = false; +- wrap_resize = false; +- wrap_move = false; +- wrap_copy = false; +- wrap_create = false; +- +- /*---check if the wrapper is installed---*/ +- QString cmdline = QString("which %1") +- .arg(lstExternalTools->getPath(MKFS_XFS)); +- fs_open(cmdline); +- +- char *cline; +- while ((cline = fs_getline())) +- wrap_create = true; +- fs_close(); +- +- +- /*---check if the wrapper is installed---*/ +- cmdline = QString("which %1") +- .arg(lstExternalTools->getPath(XFS_GROWFS)); +- fs_open(cmdline); +- +- while ((cline = fs_getline())) +- wrap_resize = RS_ENLARGE; +- fs_close(); +-} +- +-bool QP_FSXfs::mkpartfs(QString dev, QString label) { +- char szcmdline[200]; +- QString cmdline; +- +- /*---init of the error message---*/ +- _message = QString::null; +- +- /*---prepare the command line---*/ +- if (label.isEmpty()) +- sprintf(szcmdline, "-f %s", dev.latin1()); +- else +- sprintf(szcmdline, "-f -L %s %s", label.latin1(), dev.latin1()); +- cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(MKFS_XFS)) +- .arg(szcmdline); +- +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- bool success = false; +- char *cline; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- +- QRegExp rx; +- rx = QRegExp("^realtime =.*"); +- if (rx.search(line) == 0) +- success = true; +- } +- fs_close(); +- +- if (!success) _message = QString(tr("There was a problem with mkfs.xfs.")); +- return success; +-} +- +-bool QP_FSXfs::resize(QP_LibParted *_libparted, bool write, QP_PartInfo *partinfo, PedSector new_start, PedSector new_end) { +- /*---pointer to libparted---*/ +- QP_LibParted *libparted = _libparted; +- ++bool QP_FSXfs::resize(QP_LibParted * _libparted, bool write, ++ QP_PartInfo * partinfo, PedSector new_start, ++ PedSector new_end) ++{ ++ /*---pointer to libparted---*/ ++ QP_LibParted *libparted = _libparted; ++ + showDebug("%s", "Resizing a filesystem using a wrapper\n"); + +- /*---the user want to shrink or enlarge the partition?---*/ +- /*---the user want to shrink!---*/ +- if (new_end < partinfo->end) { +- /*---update the filesystem---*/ +- showDebug("%s", "shrinking filesystem not supported with xfs...\n"); +- return false; +- /*---the user want to enlarge!---*/ +- } else { +- /*---cannot enlarge if we cannot change disk geometry!---*/ +- if (partinfo->device()->isBusy()) { +- showDebug("%s", "the device is busy, so you cannot enlarge it\n"); +- _message = tr("Cannot enlarge a partition if the disk device is busy"); +- return false; +- } +- +- /*---first se the geometry of the partition---*/ +- showDebug("%s", "update geometry...\n"); +- if (!libparted->set_geometry(partinfo, new_start, new_end)) { +- showDebug("%s", "update geometry ko\n"); +- _message = libparted->message(); +- return false; +- } else { +- /*---if you are NOT committing then add in the undo/commit list---*/ +- if (!write) { +- showDebug("%s", "operation added to undo/commit list\n"); +- PedPartitionType parttype = libparted->type2parttype(partinfo->type); +- PedGeometry geom = libparted->get_geometry(partinfo); +- libparted->actlist->ins_resize(partinfo->num, new_start, new_end, geom, parttype); +- } +- } +- +- if (write) { +- /*---and now update the filesystem!---*/ +- showDebug("%s", "enlarge filesystem...\n"); +- if (!xfsresize(write, partinfo, new_end - new_start)) { +- showDebug("%s", "enlarge filesystem ko\n"); +- return false; +- } else { +- return true; +- } +- } else { +- return true; +- } +- } +-} +- +-bool QP_FSXfs::xfsresize(bool write, QP_PartInfo *partinfo, PedSector) { +- char szcmdline[200]; +- QString cmdline; +- +- bool error = false; +- +- if (!write) return true; +- +- /*---init of the error message---*/ +- _message = QString::null; +- +- if (!qpMount(partinfo->partname())) +- return false; +- +- /*---do the resize!---*/ +- sprintf(szcmdline, "%s", TMP_MOUNTPOINT); +- cmdline = QString("%1 %2") +- .arg(lstExternalTools->getPath(XFS_GROWFS)) +- .arg(szcmdline); +- +- if (!fs_open(cmdline)) { +- _message = QString(NOTFOUND); +- return false; +- } +- +- error = true; +- char *cline; +- while ((cline = fs_getline())) { +- QString line = QString(cline); +- +- QRegExp rx; +- rx = QRegExp("^realtime =.*"); +- if (rx.search(line) == 0) { +- error = false; +- } +- } +- fs_close(); +- +- if (error) { +- _message = QString(tr("Error during xfs_grow.")); +- return false; +- } +- +- if (!qpUMount(partinfo->partname())) +- return false; +- +- return true; +-} +- +-QString QP_FSXfs::fsname() +-{ +- return QString("xfs"); +-} +- +-QString QP_FSXfs::_get_label(PedPartition *part) +-{ +- char bootsect[2048]; +- char label[13]; +- +- if (!QP_FSWrap::read_sector(part, 0, 4, bootsect)) +- return QString::null; +- +- memset(label, 0, sizeof(label)); +- strncpy(label, bootsect+108, 12); +- +- //printf("returned buffer ntfs: [%s]\n", label); ++ /*---the user wants to shrink or enlarge the partition?---*/ ++ /*---the user wants to shrink!---*/ ++ if (new_end < partinfo->end) { ++ /*---update the filesystem---*/ ++ showDebug("%s", ++ "shrinking filesystem not supported with xfs...\n"); ++ return false; ++ /*---the user want to enlarge!---*/ ++ } else { ++ /*---cannot enlarge if we cannot change disk geometry!---*/ ++ if (partinfo->device()->isBusy()) { ++ showDebug("%s", ++ "the device is busy, so you cannot enlarge it\n"); ++ _message = ++ tr ++ ("Cannot enlarge a partition if the disk device is busy"); ++ return false; ++ } ++ ++ /*---first se the geometry of the partition---*/ ++ showDebug("%s", "update geometry...\n"); ++ if (!libparted->set_geometry(partinfo, new_start, new_end)) { ++ showDebug("%s", "update geometry ko\n"); ++ _message = libparted->message(); ++ return false; ++ } else { ++ /*---if you are NOT committing then add in the undo/commit list---*/ ++ if (!write) { ++ showDebug("%s", ++ "operation added to undo/commit list\n"); ++ PedPartitionType parttype = ++ libparted->type2parttype(partinfo-> ++ type); ++ PedGeometry geom = ++ libparted->get_geometry(partinfo); ++ libparted->actlist->ins_resize(partinfo-> ++ num, ++ new_start, ++ new_end, ++ geom, ++ parttype); ++ } ++ } ++ ++ if (write) { ++ /*---and now update the filesystem!---*/ ++ showDebug("%s", "enlarge filesystem...\n"); ++ if (!xfsresize ++ (write, partinfo, new_end - new_start)) { ++ showDebug("%s", "enlarge filesystem ko\n"); ++ return false; ++ } else { ++ return true; ++ } ++ } else { ++ return true; ++ } ++ } ++} ++ ++bool QP_FSXfs::xfsresize(bool write, QP_PartInfo * partinfo, PedSector) ++{ ++ QString cmdline; ++ ++ bool error = false; ++ ++ if (!write) ++ return true; ++ ++ /*---init of the error message---*/ ++ _message = QString::null; ++ ++ if (!qpMount(partinfo->partname())) ++ return false; ++ ++ /*---do the resize!---*/ ++ cmdline = lstExternalTools->getPath(XFS_GROWFS) + " " + TMP_MOUNTPOINT; ++ ++ if (!fs_open(cmdline)) { ++ _message = QString(NOTFOUND); ++ return false; ++ } ++ ++ error = true; ++ char *cline; ++ while ((cline = fs_getline())) { ++ QString line = QString(cline); ++ ++ QRegExp rx; ++ rx = QRegExp("^realtime =.*"); ++ if (rx.search(line) == 0) { ++ error = false; ++ } ++ } ++ fs_close(); ++ ++ if (error) { ++ _message = QString(tr("Error during xfs_grow.")); ++ return false; ++ } + +- return QString(label); ++ if (!qpUMount(partinfo->partname())) ++ return false; ++ ++ return true; ++} ++ ++QString QP_FSXfs::fsname() ++{ ++ return QString("xfs"); ++} ++ ++QString QP_FSXfs::_get_label(PedPartition * part) ++{ ++ char bootsect[2048]; ++ char label[13]; ++ ++ if (!QP_FSWrap::read_sector(part, 0, 4, bootsect)) ++ return QString::null; ++ ++ memset(label, 0, sizeof(label)); ++ strncpy(label, bootsect + 108, 12); ++ ++ //printf("returned buffer ntfs: [%s]\n", label); ++ ++ return QString(label); + } + + /*---FAT16 WRAPPER---------------------------------------------------------------*/ +-QString QP_FSFat16::_get_label(PedPartition *) ++QString QP_FSFat16::_get_label(PedPartition *) + { +- return QString::null; ++ return QString::null; + } + + + /*---FAT32 WRAPPER---------------------------------------------------------------*/ +-QString QP_FSFat32::_get_label(PedPartition *part) ++QString QP_FSFat32::_get_label(PedPartition * part) + { +- char buffer[PED_SECTOR_SIZE]; +- char label[12]; +- +- if (!QP_FSWrap::read_sector(part, 0, 1, buffer)) +- { +- return QString::null; +- } +- else +- { +- memset(label, 0, sizeof(label)); +- memcpy(label, buffer+0x47, 11); +- //printf("returned fat buffer: %s\n", label); +- return QString(label); +- } ++#ifdef PED_SECTOR_SIZE // PED_SECTOR_SIZE is gone in parted 1.7.x ++ char *buffer=new char[PED_SECTOR_SIZE]; ++#else ++ char *buffer=new char[part->disk->dev->sector_size]; ++#endif ++ char label[12]; ++ ++ if (!QP_FSWrap::read_sector(part, 0, 1, buffer)) { ++ delete[] buffer; ++ return QString::null; ++ } ++ ++ memset(label, 0, sizeof(label)); ++ memcpy(label, buffer + 0x47, 11); ++ //printf("returned fat buffer: %s\n", label); ++ delete[] buffer; ++ return QString(label); + } + + /*---EXT2 WRAPPER----------------------------------------------------------------*/ +-QString QP_FSExt2::_get_label(PedPartition *part) ++QString QP_FSExt2::_get_label(PedPartition * part) + { +- char bootsect[2048]; // sector number 2 (offset 1024) +- char label[16]; ++ char bootsect[2048]; // sector number 2 (offset 1024) ++ char label[16]; + +- if (!QP_FSWrap::read_sector(part, 2, 4, bootsect)) +- return QString::null; +- +- memset(label, 0, sizeof(label)); +- strncpy(label, bootsect+120, 16); +- +- //printf("returned buffer ext2/3: [%s]\n", label); ++ if (!QP_FSWrap::read_sector(part, 2, 4, bootsect)) ++ return QString::null; + +- return QString(label); ++ memset(label, 0, sizeof(label)); ++ strncpy(label, bootsect + 120, 16); ++ ++ //printf("returned buffer ext2/3: [%s]\n", label); ++ ++ return QString(label); + } + + + /*---REISERFS WRAPPER------------------------------------------------------------*/ +-QString QP_FSReiserFS::_get_label(PedPartition *) ++QString QP_FSReiserFS::_get_label(PedPartition *) + { +- //return QString::null; +- return tr("No label"); ++ //return QString::null; ++ return tr("No label"); + } + + +-QString QP_FSNtfs::_get_label(PedPartition *part) ++QString QP_FSNtfs::_get_label(PedPartition * part) + { +- u8 bootsect[16384]; +- char label[32]; +- memset(label, 0, sizeof(label)); +- BYTE cFileRecord[8192+1]; // 1024 should be enough (dwFileRecordSize) +- +- QWORD qwOffset; +- WORD nOffsetSequenceAttribute; +- BYTE *cData; +- DWORD dwAttribType; +- DWORD dwAttribLen; +- bool bAttribResident; +- BYTE *cDataResident; +- WORD nAttrSize; +- u32 dwFileRecordSize; +- QWORD i; +- +- if (!QP_FSWrap::read_sector(part, 0, 32, (char*)bootsect)) +- return QString::null; +- +- // 1. check partition has an ntfs file system +- if (memcmp(bootsect+3, "NTFS", 4) != 0) +- { +- //printf ("NTFS-001: not an NTFS partition\n"); +- return QString::null; +- } +- +- u16 nBytesPerSector = NTFS_GETU16(bootsect+0xB); +- u8 cSectorsPerCluster = NTFS_GETU8(bootsect+0xD); +- u64 qwTotalSectorsCount = NTFS_GETU64(bootsect+0x28); +- u64 qwLCNOfMftDataAttrib = NTFS_GETU64(bootsect+0x30); +- s8 cClustersPerMftRecord = NTFS_GETS8(bootsect+0x40); +- +- // check informations validity +- if (nBytesPerSector % 512 != 0) +- { +- //printf ("NTFS-002: invalid nBytesPerSector value\n"); +- return QString::null; +- } +- +- // Calculate clusters and misc informations +- u32 dwClusterSize = (DWORD)nBytesPerSector * cSectorsPerCluster; +- +- +- if (cClustersPerMftRecord > 0) +- dwFileRecordSize = cClustersPerMftRecord * dwClusterSize; +- else +- dwFileRecordSize = 1 << (-cClustersPerMftRecord); +- +- // 1. read $Volume record +- qwOffset = ((QWORD) qwLCNOfMftDataAttrib * dwClusterSize) + ((QWORD) (3 * dwFileRecordSize)); +- +- u32 dwOffsetToRead = (u32) (qwOffset / ((u64)512)); +- u32 dwSectorCountToRead = (u32) dwFileRecordSize/512; +- +- if (!QP_FSWrap::read_sector(part, dwOffsetToRead, dwSectorCountToRead, (char*)cFileRecord)) +- { +- //printf("readVolumeLabel(): failed in readData()\n"); +- return QString::null; +- } +- +- // -------- decode the MFT File record +- nOffsetSequenceAttribute = NTFS_GETU16(cFileRecord+0x14); +- cData = cFileRecord + nOffsetSequenceAttribute; +- +- do +- { +- // szData points to the beginning of an attribute +- dwAttribType = NTFS_GETU32(cData); +- dwAttribLen = NTFS_GETU32(cData+4); +- bAttribResident = (NTFS_GETU8(cData+8)==0); +- +- if(dwAttribType == 0x60) // "volume_name" +- { +- if (bAttribResident == false) +- { +- //printf("readVolumeLabel(): failed: $volume_name attribute is not resident\n"); +- return QString::null; +- } +- +- nAttrSize = NTFS_GETU16(cData+0x10); +- cDataResident = cData+NTFS_GETU16(cData+0x14); +- +- for (i=0; i < (DWORD)(nAttrSize/2); i++) +- label[i] = cDataResident[2*i]; +- } +- /*if(dwAttribType == 0x70) // "volume_information" +- { +- int nNtfsVersion = 0; +- if (bAttribResident == true) +- { +- nAttrSize = NTFS_GETU16(cData+0x10); +- cDataResident = cData+NTFS_GETU16(cData+0x14); +- nNtfsVersion = (((BYTE) cDataResident[8]) << 8) | ((BYTE) cDataResident[9]); +- printf("readVolumeLabel(): version is %d.%d\n", cDataResident[8], cDataResident[9]); +- } +- }*/ +- +- cData += dwAttribLen; +- } while(dwAttribType != (DWORD)-1); // attribute list ends with type -1 ++ u8 bootsect[16384]; ++ char label[32]; ++ memset(label, 0, sizeof(label)); ++ BYTE cFileRecord[8192 + 1]; // 1024 should be enough (dwFileRecordSize) ++ ++ QWORD qwOffset; ++ WORD nOffsetSequenceAttribute; ++ BYTE *cData; ++ DWORD dwAttribType; ++ DWORD dwAttribLen; ++ bool bAttribResident; ++ BYTE *cDataResident; ++ WORD nAttrSize; ++ u32 dwFileRecordSize; ++ QWORD i; ++ ++ if (!QP_FSWrap::read_sector(part, 0, 32, (char *) bootsect)) ++ return QString::null; ++ ++ // 1. check partition has an ntfs file system ++ if (memcmp(bootsect + 3, "NTFS", 4) != 0) { ++ //printf ("NTFS-001: not an NTFS partition\n"); ++ return QString::null; ++ } ++ ++ u16 nBytesPerSector = NTFS_GETU16(bootsect + 0xB); ++ u8 cSectorsPerCluster = NTFS_GETU8(bootsect + 0xD); ++ u64 qwTotalSectorsCount = NTFS_GETU64(bootsect + 0x28); ++ u64 qwLCNOfMftDataAttrib = NTFS_GETU64(bootsect + 0x30); ++ s8 cClustersPerMftRecord = NTFS_GETS8(bootsect + 0x40); ++ ++ // check informations validity ++ if (nBytesPerSector % 512 != 0) { ++ //printf ("NTFS-002: invalid nBytesPerSector value\n"); ++ return QString::null; ++ } ++ // Calculate clusters and misc informations ++ u32 dwClusterSize = (DWORD) nBytesPerSector * cSectorsPerCluster; ++ ++ ++ if (cClustersPerMftRecord > 0) ++ dwFileRecordSize = cClustersPerMftRecord * dwClusterSize; ++ else ++ dwFileRecordSize = 1 << (-cClustersPerMftRecord); ++ ++ // 1. read $Volume record ++ qwOffset = ++ ((QWORD) qwLCNOfMftDataAttrib * dwClusterSize) + ++ ((QWORD) (3 * dwFileRecordSize)); ++ ++ u32 dwOffsetToRead = (u32) (qwOffset / ((u64) 512)); ++ u32 dwSectorCountToRead = (u32) dwFileRecordSize / 512; ++ ++ if (!QP_FSWrap:: ++ read_sector(part, dwOffsetToRead, dwSectorCountToRead, ++ (char *) cFileRecord)) { ++ //printf("readVolumeLabel(): failed in readData()\n"); ++ return QString::null; ++ } ++ // -------- decode the MFT File record ++ nOffsetSequenceAttribute = NTFS_GETU16(cFileRecord + 0x14); ++ cData = cFileRecord + nOffsetSequenceAttribute; ++ ++ do { ++ // szData points to the beginning of an attribute ++ dwAttribType = NTFS_GETU32(cData); ++ dwAttribLen = NTFS_GETU32(cData + 4); ++ bAttribResident = (NTFS_GETU8(cData + 8) == 0); ++ ++ if (dwAttribType == 0x60) // "volume_name" ++ { ++ if (bAttribResident == false) { ++ //printf("readVolumeLabel(): failed: $volume_name attribute is not resident\n"); ++ return QString::null; ++ } ++ ++ nAttrSize = NTFS_GETU16(cData + 0x10); ++ cDataResident = cData + NTFS_GETU16(cData + 0x14); ++ ++ for (i = 0; i < (DWORD) (nAttrSize / 2); i++) ++ label[i] = cDataResident[2 * i]; ++ } ++ /*if(dwAttribType == 0x70) // "volume_information" ++ { ++ int nNtfsVersion = 0; ++ if (bAttribResident == true) ++ { ++ nAttrSize = NTFS_GETU16(cData+0x10); ++ cDataResident = cData+NTFS_GETU16(cData+0x14); ++ nNtfsVersion = (((BYTE) cDataResident[8]) << 8) | ((BYTE) cDataResident[9]); ++ printf("readVolumeLabel(): version is %d.%d\n", cDataResident[8], cDataResident[9]); ++ } ++ } */ ++ ++ cData += dwAttribLen; ++ } while (dwAttribType != (DWORD) - 1); // attribute list ends with type -1 + +- return QString(label); ++ return QString(label); + } +diff -Naur qtparted-0.4.5.orig/src/qp_fswrap.h qtparted-0.4.5/src/qp_fswrap.h +--- qtparted-0.4.5.orig/src/qp_fswrap.h 2005-07-06 23:29:54.000000000 +0200 ++++ qtparted-0.4.5/src/qp_fswrap.h 2006-01-16 01:43:30.000000000 +0100 +@@ -161,7 +161,7 @@ + protected: + bool qpMount(QString device); + bool qpUMount(QString device); +- bool fs_open(QString cmdline); ++ bool fs_open(QString cmdline, bool localized=false); + char *fs_getline(); + int fs_close(); + QString _message; +diff -Naur qtparted-0.4.5.orig/src/qp_partition.cpp qtparted-0.4.5/src/qp_partition.cpp +--- qtparted-0.4.5.orig/src/qp_partition.cpp 2003-08-27 18:13:22.000000000 +0200 ++++ qtparted-0.4.5/src/qp_partition.cpp 2005-10-15 13:13:01.000000000 +0200 +@@ -22,8 +22,7 @@ + #include "qp_partition.h" + #include "qp_options.h" + +-QP_Partition::QP_Partition(QP_PartInfo *pinfo, QWidget *parent, const char *name, WFlags f) +- :QP_PartWidget(pinfo, parent, name, f) { ++QP_Partition::QP_Partition(QP_PartInfo *pinfo, QWidget *parent, const char *name, WFlags f):QP_PartWidget(pinfo, parent, name, f) { + } + + QP_Partition::~QP_Partition() { +diff -Naur qtparted-0.4.5.orig/src/qp_partition.h qtparted-0.4.5/src/qp_partition.h +--- qtparted-0.4.5.orig/src/qp_partition.h 2003-08-27 18:13:19.000000000 +0200 ++++ qtparted-0.4.5/src/qp_partition.h 2005-10-15 13:13:01.000000000 +0200 +@@ -36,8 +36,8 @@ + Q_OBJECT + + public: +- QP_Partition(QP_PartInfo *, QWidget *parent=0, const char *name=0, WFlags f = 0); +- ~QP_Partition(); ++ QP_Partition(QP_PartInfo *, QWidget *parent=0, const char *name=0, WFlags f = 0); ++ ~QP_Partition(); + }; + + #endif +diff -Naur qtparted-0.4.5.orig/src/qp_partlist.cpp qtparted-0.4.5/src/qp_partlist.cpp +--- qtparted-0.4.5.orig/src/qp_partlist.cpp 2003-08-27 18:13:19.000000000 +0200 ++++ qtparted-0.4.5/src/qp_partlist.cpp 2005-10-15 12:58:31.000000000 +0200 +@@ -23,29 +23,29 @@ + #include "qp_options.h" + + QP_PartList::QP_PartList(QWidget *parent, const char *name, WFlags f) +- :QWidget(parent, name, f) { ++ :QWidget(parent, name, f) { + } + + QP_PartList::~QP_PartList() { + } + + QP_PartInfo *QP_PartList::selPartInfo() { +- return _selPartInfo; ++ return _selPartInfo; + } + + void QP_PartList::setselPartInfo(QP_PartInfo *partinfo) { +- _selPartInfo = partinfo; ++ _selPartInfo = partinfo; + } + + void QP_PartList::clear() { + } + + QP_Device *QP_PartList::device() { +- return _device; ++ return _device; + } + + void QP_PartList::setDevice(QP_Device *device) { +- _device = device; ++ _device = device; + } + + void QP_PartList::addPrimary(QP_PartInfo *) { +@@ -58,9 +58,9 @@ + } + + float QP_PartList::mb_hdsize() { +- return _mb_hdsize; ++ return _mb_hdsize; + } + + void QP_PartList::set_mb_hdsize(float mb_hdsize) { +- _mb_hdsize = mb_hdsize; ++ _mb_hdsize = mb_hdsize; + } +diff -Naur qtparted-0.4.5.orig/src/qp_partlist.h qtparted-0.4.5/src/qp_partlist.h +--- qtparted-0.4.5.orig/src/qp_partlist.h 2003-08-27 18:13:22.000000000 +0200 ++++ qtparted-0.4.5/src/qp_partlist.h 2005-10-15 12:58:31.000000000 +0200 +@@ -34,33 +34,32 @@ + #include "qp_libparted.h" + + class QP_PartList : public QWidget { +-Q_OBJECT +- ++ Q_OBJECT + public: +- QP_PartList(QWidget *parent=0, const char *name=0, WFlags f = 0); +- ~QP_PartList(); +- QP_PartInfo *selPartInfo(); /*---return selected partition ---*/ +- void setselPartInfo(QP_PartInfo *); /*---change the selected partition ---*/ +- void clear(); /*---clear the chart ---*/ +- QP_Device *device(); /*---return the device ---*/ +- void setDevice(QP_Device *); /*---set the Device ---*/ +- void addPrimary(QP_PartInfo *); /*---add a Primary or Extended partition ---*/ +- void addLogical(QP_PartInfo *); /*---add a Logical partition ---*/ +- void draw(); /*---repaint the widget ---*/ +- float mb_hdsize(); /*---return the size of the hardisk ---*/ +- void set_mb_hdsize(float); /*---set the size of the hardisk ---*/ ++ QP_PartList(QWidget *parent=0, const char *name=0, WFlags f = 0); ++ ~QP_PartList(); ++ QP_PartInfo *selPartInfo(); /*---return selected partition ---*/ ++ void setselPartInfo(QP_PartInfo *); /*---change the selected partition ---*/ ++ void clear(); /*---clear the chart ---*/ ++ QP_Device *device(); /*---return the device ---*/ ++ void setDevice(QP_Device *); /*---set the Device ---*/ ++ void addPrimary(QP_PartInfo *); /*---add a Primary or Extended partition ---*/ ++ void addLogical(QP_PartInfo *); /*---add a Logical partition ---*/ ++ void draw(); /*---repaint the widget ---*/ ++ float mb_hdsize(); /*---return the size of the hardisk ---*/ ++ void set_mb_hdsize(float); /*---set the size of the hardisk ---*/ + + private: +- float _mb_hdsize; /*---size of the harddisk in megabyte ---*/ +- QP_Device *_device; /*---the device ---*/ ++ float _mb_hdsize; /*---size of the harddisk in megabyte ---*/ ++ QP_Device *_device; /*---the device ---*/ + + protected: +- QP_PartInfo *_selPartInfo; /*---partition selected ---*/ ++ QP_PartInfo *_selPartInfo; /*---partition selected ---*/ + + signals: +- void sigSelectPart(QP_PartInfo *); /*---emitted when you change the selection ---*/ +- void sigDevicePopup(QPoint); /*---emitted when you want to popup (device)---*/ +- void sigPopup(QPoint); /*---emitted when you want to pop (partition)--*/ ++ void sigSelectPart(QP_PartInfo *); /*---emitted when you change the selection ---*/ ++ void sigDevicePopup(QPoint); /*---emitted when you want to popup (device)---*/ ++ void sigPopup(QPoint); /*---emitted when you want to pop (partition)--*/ + }; + + #endif +diff -Naur qtparted-0.4.5.orig/src/qp_spinbox.cpp qtparted-0.4.5/src/qp_spinbox.cpp +--- qtparted-0.4.5.orig/src/qp_spinbox.cpp 2003-08-27 18:13:19.000000000 +0200 ++++ qtparted-0.4.5/src/qp_spinbox.cpp 2005-10-15 13:13:01.000000000 +0200 +@@ -25,24 +25,22 @@ + #include "qp_options.h" + + QP_SpinBox::QP_SpinBox(QWidget *parent, const char *name) +- :QSpinBox (parent, name) { +- /*---initialization of the default value---*/ +- _floatminval = 0; +- _floatmaxval = 0; +- _pedminval = 0; +- _pedmaxval = 0; +- _pedvalue = 0; +- step = 1; +- _floatvalue = 0; +- _format = 0; +- _update = true; +- +- /*---format of the displayed string (ie: 999.99)---*/ +- format = "%3.2f"; +- setValue((float)0); +- setSteps(10, 10); +- val = new QDoubleValidator(_floatminval, _floatmaxval, 2, this); +- setValidator (val); ++ :QSpinBox (parent, name) ++ ,_floatminval(0) ++ ,_floatmaxval(0) ++ ,_pedminval(0) ++ ,_pedmaxval(0) ++ ,step(1) ++ ,_floatvalue(0) ++ ,_format(0) ++ ,_update(true) ++{ ++ /*---format of the displayed string (ie: 999.99)---*/ ++ format = "%3.2f"; ++ setValue((float)0); ++ setSteps(10, 10); ++ val = new QDoubleValidator(_floatminval, _floatmaxval, 2, this); ++ setValidator (val); + } + + +@@ -51,189 +49,204 @@ + + + void QP_SpinBox::setFormatString (const char *fmt) { +- format = fmt; ++ format = fmt; + } + + + /*---change between mbyte and gbyte---*/ + void QP_SpinBox::setFormat(int format) { +- _format = format; +- float f_minvalue = 0; +- float f_maxvalue = 0; +- float f_value = 0; +- +- if (_format == 0) { f_minvalue = float(_pedminval * 1.0 / MBYTE_SECTORS); +- f_maxvalue = float(_pedmaxval * 1.0 / MBYTE_SECTORS); +- f_value = float(_pedvalue * 1.0 / MBYTE_SECTORS); } else +- if (_format == 1) { f_minvalue = float(_pedminval * 1.0 / GBYTE_SECTORS); +- f_maxvalue = float(_pedmaxval * 1.0 / GBYTE_SECTORS); +- f_value = float(_pedvalue * 1.0 / GBYTE_SECTORS); } +- +- /*---don't update internal ped values!---*/ +- _update = false; +- setRange(f_minvalue, f_maxvalue); +- setValue(f_value); +- _update = true; ++ _format = format; ++ float f_minvalue = 0; ++ float f_maxvalue = 0; ++ float f_value = 0; ++ ++ if (_format == 0) { ++ f_minvalue = float(_pedminval * 1.0 / MBYTE_SECTORS); ++ f_maxvalue = float(_pedmaxval * 1.0 / MBYTE_SECTORS); ++ f_value = float(_pedvalue * 1.0 / MBYTE_SECTORS); ++ } else if (_format == 1) { ++ f_minvalue = float(_pedminval * 1.0 / GBYTE_SECTORS); ++ f_maxvalue = float(_pedmaxval * 1.0 / GBYTE_SECTORS); ++ f_value = float(_pedvalue * 1.0 / GBYTE_SECTORS); ++ } ++ ++ /*---don't update internal ped values!---*/ ++ _update = false; ++ setRange(f_minvalue, f_maxvalue); ++ setValue(f_value); ++ _update = true; + } + +- + void QP_SpinBox::setValue(float value) { +- char buf[20]; +- if (_floatminval <= value && value <= _floatmaxval) { +- sprintf (buf, (const char *) format, value); +- _floatvalue = value; +- QSpinBox::setValue(int(value * 100.0)); +- } ++ char buf[20]; ++ if (_floatminval <= value && value <= _floatmaxval) { ++ sprintf (buf, (const char *) format, value); ++ _floatvalue = value; ++ QSpinBox::setValue(int(value * 100.0)); ++ } + } + + + void QP_SpinBox::setValue(PedSector value) { +- if (_pedminval <= value && value <= _pedmaxval) { +- float f_value = 0; +- +- if (_format == 0) f_value = float(value * 1.0 / MBYTE_SECTORS); else +- if (_format == 1) f_value = float(value * 1.0 / GBYTE_SECTORS); +- +- _pedvalue = value; ++ if (_pedminval <= value && value <= _pedmaxval) { ++ float f_value = 0; + +- /*---don't update internal ped values!---*/ +- _update = false; +- setValue(f_value); +- _update = true; +- } ++ if (_format == 0) ++ f_value = float(value * 1.0 / MBYTE_SECTORS); else ++ if (_format == 1) ++ f_value = float(value * 1.0 / GBYTE_SECTORS); ++ ++ _pedvalue = value; ++ ++ /*---don't update internal ped values!---*/ ++ _update = false; ++ setValue(f_value); ++ _update = true; ++ } + } + + + void QP_SpinBox::setMaxValue(PedSector maxVal) { +- float f_maxvalue = 0; ++ float f_maxvalue = 0; + +- _pedmaxval = maxVal; ++ _pedmaxval = maxVal; + +- if (_format == 0) {f_maxvalue = float(maxVal * 1.0 / MBYTE_SECTORS);} else +- if (_format == 1) {f_maxvalue = float(maxVal * 1.0 / GBYTE_SECTORS);} ++ if (_format == 0) ++ f_maxvalue = float(maxVal * 1.0 / MBYTE_SECTORS); ++ else if (_format == 1) ++ f_maxvalue = float(maxVal * 1.0 / GBYTE_SECTORS); + +- setMaxValue(f_maxvalue); ++ setMaxValue(f_maxvalue); + } + + + void QP_SpinBox::setMinValue(PedSector minVal) { +- float f_minvalue = 0; ++ float f_minvalue = 0; + +- _pedminval = minVal; ++ _pedminval = minVal; + +- if (_format == 0) {f_minvalue = float(minVal * 1.0 / MBYTE_SECTORS);} else +- if (_format == 1) {f_minvalue = float(minVal * 1.0 / GBYTE_SECTORS);} ++ if (_format == 0) ++ f_minvalue = float(minVal * 1.0 / MBYTE_SECTORS); ++ else if (_format == 1) ++ f_minvalue = float(minVal * 1.0 / GBYTE_SECTORS); + +- setMinValue(f_minvalue); ++ setMinValue(f_minvalue); + } + + + void QP_SpinBox::setStep (float s) { +- step = s; +- setSteps ((int)(step * 10.0), (int)(step * 10.0)); ++ step = s; ++ setSteps ((int)(step * 10.0), (int)(step * 10.0)); + } + +- + float QP_SpinBox::getStep() const { +- return step; ++ return step; + } + +- + void QP_SpinBox::setRange(float minVal, float maxVal) { +- if (minVal <= maxVal) { +- _floatminval = minVal; +- _floatmaxval = maxVal; +- QRangeControl::setRange(int(minVal * 100.0), int(maxVal * 100.0)); +- val->setRange(minVal, maxVal, 2); +- } ++ if (minVal <= maxVal) { ++ _floatminval = minVal; ++ _floatmaxval = maxVal; ++ QRangeControl::setRange(int(minVal * 100.0), int(maxVal * 100.0)); ++ val->setRange(minVal, maxVal, 2); ++ } + } + + + void QP_SpinBox::setRange(PedSector minVal, PedSector maxVal) { +- float f_minvalue = 0; +- float f_maxvalue = 0; ++ float f_minvalue = 0; ++ float f_maxvalue = 0; + +- _pedminval = minVal; +- _pedmaxval = maxVal; ++ _pedminval = minVal; ++ _pedmaxval = maxVal; + +- if (_format == 0) { f_minvalue = float(minVal * 1.0 / MBYTE_SECTORS); +- f_maxvalue = float(maxVal * 1.0 / MBYTE_SECTORS); } else +- if (_format == 1) { f_minvalue = float(minVal * 1.0 / GBYTE_SECTORS); +- f_maxvalue = float(maxVal * 1.0 / GBYTE_SECTORS); } ++ if (_format == 0) { f_minvalue = float(minVal * 1.0 / MBYTE_SECTORS); ++ f_maxvalue = float(maxVal * 1.0 / MBYTE_SECTORS); } else ++ if (_format == 1) { f_minvalue = float(minVal * 1.0 / GBYTE_SECTORS); ++ f_maxvalue = float(maxVal * 1.0 / GBYTE_SECTORS); } + +- setRange(f_minvalue, f_maxvalue); ++ setRange(f_minvalue, f_maxvalue); + } + + + void QP_SpinBox::getRange(float &minVal, float &maxVal) { +- minVal = _floatminval; +- maxVal = _floatmaxval; ++ minVal = _floatminval; ++ maxVal = _floatmaxval; + } + + PedSector QP_SpinBox::pedValue() { +- return _pedvalue; ++ return _pedvalue; + } + + PedSector QP_SpinBox::pedMaxValue() { +- return _pedmaxval; ++ return _pedmaxval; + } + + void QP_SpinBox::stepUp() { +- QSpinBox::stepUp(); ++ QSpinBox::stepUp(); + +- int diff = int(_floatmaxval * 100.0) - int(_floatvalue * 100.0); +- if (diff <= 1) _pedvalue = _pedmaxval; ++ int diff = int(_floatmaxval * 100.0) - int(_floatvalue * 100.0); ++ if (diff <= 1) _pedvalue = _pedmaxval; + } + + void QP_SpinBox::stepDown() { +- QSpinBox::stepDown(); ++ QSpinBox::stepDown(); + +- int diff = int(_floatvalue * 100.0) - int(_floatminval * 100.0); +- if (diff <= 1) _pedvalue = _pedminval; ++ int diff = int(_floatvalue * 100.0) - int(_floatminval * 100.0); ++ if (diff <= 1) _pedvalue = _pedminval; + } + + void QP_SpinBox::setMaxValue(float maxvalue) { +- _floatmaxval = maxvalue; +- QSpinBox::setMaxValue(int(maxvalue * 100.0)); ++ _floatmaxval = maxvalue; ++ QSpinBox::setMaxValue(int(maxvalue * 100.0)); + } + + void QP_SpinBox::setMinValue(float minvalue) { +- _floatminval = minvalue; +- QSpinBox::setMinValue(int(minvalue * 100.0)); ++ _floatminval = minvalue; ++ QSpinBox::setMinValue(int(minvalue * 100.0)); + } + + void QP_SpinBox::valueChange() { +- bool rc; +- updateDisplay(); +- mapTextToValue(&rc); +- +- /*---don't update internal ped values!---*/ +- if (_update) +- if (_floatvalue == _floatminval) _pedvalue = _pedminval; else +- if (_floatvalue == _floatmaxval) _pedvalue = _pedmaxval; else { +- if (_format == 0) _pedvalue = PedSector(_floatvalue * MBYTE_SECTORS); else +- if (_format == 1) _pedvalue = PedSector(_floatvalue * GBYTE_SECTORS); +- } +- +- /*---ped value should be beetween min and max---*/ +- if (_pedvalue < _pedminval) _pedvalue = _pedminval; +- if (_pedvalue > _pedmaxval) _pedvalue = _pedmaxval; ++ bool rc; ++ updateDisplay(); ++ mapTextToValue(&rc); ++ ++ /*---don't update internal ped values!---*/ ++ if (_update) { ++ if (_floatvalue == _floatminval) ++ _pedvalue = _pedminval; ++ else if (_floatvalue == _floatmaxval) ++ _pedvalue = _pedmaxval; ++ else { ++ if (_format == 0) ++ _pedvalue = PedSector(_floatvalue * MBYTE_SECTORS); ++ else if (_format == 1) ++ _pedvalue = PedSector(_floatvalue * GBYTE_SECTORS); ++ } ++ } ++ ++ /*---ped value should be beetween min and max---*/ ++ if (_pedvalue < _pedminval) ++ _pedvalue = _pedminval; ++ ++ if (_pedvalue > _pedmaxval) ++ _pedvalue = _pedmaxval; + +- emit valueChanged(_pedvalue); ++ emit valueChanged(_pedvalue); + } + + + int QP_SpinBox::mapTextToValue(bool *ok) { +- const char *txt = text(); +- _floatvalue = atof(txt); +- *ok = true; +- return int(_floatvalue * 100.0); ++ const char *txt = text(); ++ _floatvalue = atof(txt); ++ *ok = true; ++ return int(_floatvalue * 100.0); + } + + + QString QP_SpinBox::mapValueToText(int v) { +- float f = float(v) / 100.0; +- QString buf; +- buf.sprintf((const char *)format, f); +- return buf; ++ float f = float(v) / 100.0; ++ QString buf; ++ buf.sprintf((const char *)format, f); ++ return buf; + } +diff -Naur qtparted-0.4.5.orig/src/qp_spinbox.h qtparted-0.4.5/src/qp_spinbox.h +--- qtparted-0.4.5.orig/src/qp_spinbox.h 2003-08-27 18:13:18.000000000 +0200 ++++ qtparted-0.4.5/src/qp_spinbox.h 2005-10-15 13:13:01.000000000 +0200 +@@ -42,51 +42,50 @@ + typedef long long PedSector; + + class QP_SpinBox : public QSpinBox { +- Q_OBJECT ++ Q_OBJECT + public: +- QP_SpinBox(QWidget *parent = 0L, const char *name = 0L); +- ~QP_SpinBox(); ++ QP_SpinBox(QWidget *parent = 0L, const char *name = 0L); ++ ~QP_SpinBox(); + +- void setFormatString(const char *fmt); ++ void setFormatString(const char *fmt); + +- void setValue(PedSector); +- void setMaxValue(PedSector); +- void setMinValue(PedSector); +- +- void setStep(float step); +- float getStep() const; +- +- void setRange(PedSector minVal, PedSector maxVal); +- void getRange(float &minVal, float &maxVal); +- PedSector pedValue(); +- PedSector pedMaxValue(); ++ void setValue(PedSector); ++ void setMaxValue(PedSector); ++ void setMinValue(PedSector); ++ ++ void setStep(float step); ++ float getStep() const; ++ ++ void setRange(PedSector minVal, PedSector maxVal); ++ void getRange(float &minVal, float &maxVal); ++ PedSector pedValue(); ++ PedSector pedMaxValue(); + + signals: +- void valueChanged(PedSector); ++ void valueChanged(PedSector); + + public slots: +- virtual void stepUp(); +- virtual void stepDown(); +- void setMaxValue(float); +- void setMinValue(float); +- void setFormat(int); ++ virtual void stepUp(); ++ virtual void stepDown(); ++ void setMaxValue(float); ++ void setMinValue(float); ++ void setFormat(int); + + protected: +- int mapTextToValue(bool *ok); +- QString mapValueToText(int v); +- void valueChange(); ++ int mapTextToValue(bool *ok); ++ QString mapValueToText(int v); ++ void valueChange(); + + private: +- void setRange(float minVal, float maxVal); +- void setValue(float value); +- float step, _floatminval, _floatmaxval, _floatvalue; +- QString format; +- QDoubleValidator *val; +- PedSector _pedminval; +- PedSector _pedmaxval; +- PedSector _pedvalue; +- int _format; +- bool _update; ++ void setRange(float minVal, float maxVal); ++ void setValue(float value); ++ float step, _floatminval, _floatmaxval, _floatvalue; ++ QString format; ++ QDoubleValidator *val; ++ PedSector _pedminval; ++ PedSector _pedmaxval; ++ PedSector _pedvalue; ++ int _format; ++ bool _update; + }; +- + #endif +diff -Naur qtparted-0.4.5.orig/src/qp_window.cpp qtparted-0.4.5/src/qp_window.cpp +--- qtparted-0.4.5.orig/src/qp_window.cpp 2005-08-10 13:05:37.000000000 +0200 ++++ qtparted-0.4.5/src/qp_window.cpp 2005-10-15 12:44:39.000000000 +0200 +@@ -93,14 +93,14 @@ + /*---the window is so designed: + * + * .------------------------------. +- * |QSplitter | | +- * | | | ++ * |QSplitter | | ++ * | | | + * | +----------+ | +-----------+ | + * | |NavView | | |DiskView | | +- * | | | | | | | +- * | | | | | | | ++ * | | | | | | | ++ * | | | | | | | + * | +----------+ | +-----------+ | +- * | | | ++ * | | | + * `------------------------------' + */ + +@@ -115,16 +115,16 @@ + navSplit->setResizeMode(navview, QSplitter::KeepSize); + /*---connect the selected signal (when user, for example, select /dev/hda)---*/ + connect(navview, SIGNAL(sigSelectDevice(QP_Device *)), +- this, SLOT(slotSelectDevice(QP_Device *))); ++ this, SLOT(slotSelectDevice(QP_Device *))); + + /*---add the DiskView widget---*/ + diskview = new QP_DiskView(navSplit); + /*---emitted when you select a partition---*/ + connect(diskview, SIGNAL(sigSelectPart(QP_PartInfo *)), +- this, SLOT(slotSelectPart(QP_PartInfo *))); ++ this, SLOT(slotSelectPart(QP_PartInfo *))); + /*---emit when the user want to popup the context menu---*/ + connect(diskview, SIGNAL(sigPopup(QPoint)), +- this, SLOT(slotPopup(QPoint))); ++ this, SLOT(slotPopup(QPoint))); + connect(diskview, SIGNAL(sigDevicePopup(QPoint)), + this, SLOT(slotDevicePopup(QPoint))); + /*---connect the sigTimer used for dlgprogress during "update progressbar"---*/ +diff -Naur qtparted-0.4.5.orig/src/qp_window.h qtparted-0.4.5/src/qp_window.h +--- qtparted-0.4.5.orig/src/qp_window.h 2004-04-12 12:30:13.000000000 +0200 ++++ qtparted-0.4.5/src/qp_window.h 2005-10-15 12:44:39.000000000 +0200 +@@ -49,89 +49,87 @@ + + + class QP_MainWindow : public QMainWindow { +-Q_OBJECT +- ++ Q_OBJECT + public: +- QP_MainWindow(QP_Settings *, QWidget *parent, const char *name); +- ~QP_MainWindow(); +- void init(); /*---init the mainwindow ---*/ +- void refreshDiskView(); +- void setpopupmenu(QPopupMenu *); +- QPopupMenu *popupmenu(); +- QPopupMenu *mnuDisks; +- QPopupMenu *mnuDevice; +- QAction *actUndo; +- QAction *actCommit; +- QAction *actQuit; +- QAction *actProperty; +- QAction *actCreate; +- QAction *actFormat; +- QAction *actResize; +- QAction *actMove; +- QAction *actDelete; +- QAction *actConfig; +- QAction *actWhatThis; +- QAction *actAbout; +- QAction *actAboutQT; +- QAction *actNavProperty; +- QAction *actNavPartTable; +- QP_DiskView *diskview; +- QP_dlgCreate *dlgcreate; /*---the create dialog ---*/ +- QP_dlgFormat *dlgformat; /*---the format dialog ---*/ +- QP_dlgResize *dlgresize; /*---the resize dialog ---*/ +- QP_dlgProgress *dlgprogress; /*---the progress dialog ---*/ +- QP_dlgConfig *dlgconfig; /*---the configuration dialog ---*/ +- QP_dlgDevProperty *dlgdevprop; /*---the device property dialog---*/ +- QP_NavView *navview; /*---the disk navigation widget---*/ +- QP_Settings *settings; +- ++ QP_MainWindow(QP_Settings *, QWidget *parent, const char *name); ++ ~QP_MainWindow(); ++ void init(); /*---init the mainwindow ---*/ ++ void refreshDiskView(); ++ void setpopupmenu(QPopupMenu *); + + protected: +- void createAction(); +- void addMenuBar(); +- void addStatusBar(); +- void addToolBar(); +- void buildDisksMenu(); +- void loadSettings(); +- void ShowMoveResizeDialog(QTParted::actType moveresize); +- void InitMenu(); +- void InitProgressDialog(); +- void DoneProgressDialog(); ++ QPopupMenu *popupmenu(); ++ QPopupMenu *mnuDisks; ++ QPopupMenu *mnuDevice; ++ QAction *actUndo; ++ QAction *actCommit; ++ QAction *actQuit; ++ QAction *actProperty; ++ QAction *actCreate; ++ QAction *actFormat; ++ QAction *actResize; ++ QAction *actMove; ++ QAction *actDelete; ++ QAction *actConfig; ++ QAction *actWhatThis; ++ QAction *actAbout; ++ QAction *actAboutQT; ++ QAction *actNavProperty; ++ QAction *actNavPartTable; ++ QP_DiskView *diskview; ++ QP_dlgCreate *dlgcreate; /*---the create dialog ---*/ ++ QP_dlgFormat *dlgformat; /*---the format dialog ---*/ ++ QP_dlgResize *dlgresize; /*---the resize dialog ---*/ ++ QP_dlgProgress *dlgprogress; /*---the progress dialog ---*/ ++ QP_dlgConfig *dlgconfig; /*---the configuration dialog ---*/ ++ QP_dlgDevProperty *dlgdevprop; /*---the device property dialog---*/ ++ QP_NavView *navview; /*---the disk navigation widget---*/ ++ QP_Settings *settings; + ++protected: ++ void createAction(); ++ void addMenuBar(); ++ void addStatusBar(); ++ void addToolBar(); ++ void buildDisksMenu(); ++ void loadSettings(); ++ void ShowMoveResizeDialog(QTParted::actType moveresize); ++ void InitMenu(); ++ void InitProgressDialog(); ++ void DoneProgressDialog(); + + private: +- QVBox *central; +- QPopupMenu* _popupmenu; +- QPopupMenu* _navpopupmenu; +- QPopupMenu *mnuOperations; +- int mnuSetActiveID; +- int mnuSetHiddenID; ++ QVBox *central; ++ QPopupMenu* _popupmenu; ++ QPopupMenu* _navpopupmenu; ++ QPopupMenu *mnuOperations; ++ int mnuSetActiveID; ++ int mnuSetHiddenID; + + protected slots: +- void slotCreate(); +- void slotFormat(); +- void slotResize(); +- void slotMove(); +- void slotDelete(); +- void slotConfig(); +- void slotProperty(); +- void slotWhatsThis(); +- void slotAbout(); +- void slotAboutQT(); +- void slotNavProperty(); +- void slotNavPartTable(); +- void slotSelectPart(QP_PartInfo *); +- void slotDevicePopup(QPoint pos); +- void slotPopup(QPoint pos); +- void slotSelectDevice(QP_Device *); +- void slotSetActive(); +- void slotSetHidden(); +- void slotUndo(); +- void slotCommit(); +- void slotDiskChanged(); ++ void slotCreate(); ++ void slotFormat(); ++ void slotResize(); ++ void slotMove(); ++ void slotDelete(); ++ void slotConfig(); ++ void slotProperty(); ++ void slotWhatsThis(); ++ void slotAbout(); ++ void slotAboutQT(); ++ void slotNavProperty(); ++ void slotNavPartTable(); ++ void slotSelectPart(QP_PartInfo *); ++ void slotDevicePopup(QPoint pos); ++ void slotPopup(QPoint pos); ++ void slotSelectDevice(QP_Device *); ++ void slotSetActive(); ++ void slotSetHidden(); ++ void slotUndo(); ++ void slotCommit(); ++ void slotDiskChanged(); + + signals: +- void sigSplashInfo(const QString &); ++ void sigSplashInfo(const QString &); + }; +- + #endif +diff -Naur qtparted-0.4.5.orig/src/runprog.cpp qtparted-0.4.5/src/runprog.cpp +--- qtparted-0.4.5.orig/src/runprog.cpp 2003-08-27 18:13:20.000000000 +0200 ++++ qtparted-0.4.5/src/runprog.cpp 1970-01-01 01:00:00.000000000 +0100 +@@ -1,160 +0,0 @@ +-/*************************************************************************** +- runprog.cpp - description +- ------------------- +- begin : Wed Sep 4 19:21:54 UTC 2002 +- copyright : (C) 2002 by Francois Dupoux +- email : fdupoux@partimage.org +- ***************************************************************************/ +- +-/*************************************************************************** +- * * +- * This program is free software; you can redistribute it and/or modify * +- * it under the terms of the GNU General Public License as published by * +- * the Free Software Foundation; either version 2 of the License, or * +- * (at your option) any later version. * +- * * +- ***************************************************************************/ +- +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +- +-#include "runprog.h" +-#include "qp_options.h" +- +-//------------------------------------------------ +-/*int doesFileExists2(char *szPath) +-{ +-#ifdef HAVE_FSTAT64 +- struct stat64 fStat; +-#else +- struct stat fStat; +-#endif +- int nFd; +- int nRes; +- +- errno = 0; +-#ifdef HAVE_OPEN64 +- nFd = open64(szPath, O_RDONLY | O_NOFOLLOW | O_LARGEFILE); +-#else +- nFd = open(szPath, O_RDONLY | O_NOFOLLOW | O_LARGEFILE); +-#endif +- //fStream = fopen(szPath, "rb"); +- //if (!fStream) // error +- if (nFd == -1) +- { +- return (errno != ENOENT); +- } +- else // success +- { +-#ifdef HAVE_FSTAT64 +- nRes = fstat64(nFd, &fStat); +-#else +- nRes = fstat(nFd, &fStat); +-#endif +- +- if (nRes == -1) +- return true; // for large files +- //fclose(fStream); +- ::close(nFd); +- return (S_ISREG(fStat.st_mode)); +- } +-} +- +-//------------------------------------------------ +-int locateProgram(char *szResultPath, int nPathLen, char *szBin) +-{ +- long i; +- char *szLocations[] = {"/sbin", "/usr/sbin", "/usr/local/sbin", "/bin", "/usr/bin", "/usr/local/bin", ""}; +- char szTemp[2048]; +- +- for (i=0; *(szLocations[i]); i++) +- { +- snprintf(szTemp, sizeof(szTemp), "%s/%s", szLocations[i], szBin); +- //pi_printf ("--> pgm=%s/%s\n", szLocations[i], szBin); +- if (doesFileExists2(szTemp)) +- { +- snprintf(szResultPath, nPathLen, "%s/%s", szLocations[i], szBin); +- return 0; // okay +- } +- } +- +- return -1; // error +-} +-*/ +- +-//------------------------------------------------ +-int execProgram(char *szProgram, char *argv[], char *szOutput, int nMaxOutput) +-{ +- int nFd[2]; +- int nRes; +- pid_t pid; +- +- // init +- memset(szOutput, 0, nMaxOutput); +- if (pipe(nFd) < 0) +- return -1; +- +- pid = fork(); +- switch (pid) +- { +- case -1: // error +- perror ("fork() in execProgram"); +- return -1; +- +- case 0: // child +- dup2(nFd[1], STDOUT_FILENO); // stdout --> parent process +- dup2(nFd[1], STDERR_FILENO); // stdout --> parent process +- nRes = execve(szProgram, argv, NULL); +- exit(0); +- break; +- +- default: // parent +- read(nFd[0], szOutput, nMaxOutput); +- //pi_printf ("\n\n\n[[[[[[[%s]]]]]]]\n\n\n", szString); +- waitpid(pid, NULL, 0); +- sleep(1); +- break; +- }; +- +- return 0; +-} +- +-//------------------------------------------------ +-//---------------------- USAGE ------------------- +-//------------------------------------------------ +-/* +- nRes = locateProgram(szFullPath, sizeof(szFullPath), g_fs[nFs].szCmdMkfsName); +- if (nRes == -1) +- return CResult("Can't find program %s which is required
to format the partition.
" +- "Please, install %s.
You can search on http://www.freshmeat.net.", +- g_fs[nFs].szCmdMkfsName, g_fs[nFs].szFsTools); +- +- if (szLabel && *szLabel) // not empty +- snprintf (szFullLabel, sizeof(szFullLabel), "%s", szLabel); +- else +- snprintf (szFullLabel, sizeof(szFullLabel), "none"); +- +- argv[0] = g_fs[nFs].szCmdMkfsOpts; +- argv[1] = g_fs[nFs].szCmdMkfsLabelOpts; +- argv[2] = szFullLabel; +- argv[3] = g_fs[nFs].szCmdMkfsOpts; +- argv[4] = szDevice; +- argv[5] = NULL; +- +- // pi_printf debug +- pi_printf ("FORMATTING: path=[%s]\n", szFullPath); +- for (int j=0; j < 4; j++) +- pi_printf ("argv[%d]=%s\n", j, argv[j]); +- +- execProgram(szFullPath, argv, szOutput, sizeof(szOutput)); +-*/ +- +diff -Naur qtparted-0.4.5.orig/src/runprog.h qtparted-0.4.5/src/runprog.h +--- qtparted-0.4.5.orig/src/runprog.h 2003-08-27 18:13:21.000000000 +0200 ++++ qtparted-0.4.5/src/runprog.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,20 +0,0 @@ +-/*************************************************************************** +- runprog.h - description +- ------------------- +- begin : Wed Sep 4 19:21:54 UTC 2002 +- copyright : (C) 2002 by Francois Dupoux +- email : fdupoux@partimage.org +- ***************************************************************************/ +- +-/*************************************************************************** +- * * +- * This program is free software; you can redistribute it and/or modify * +- * it under the terms of the GNU General Public License as published by * +- * the Free Software Foundation; either version 2 of the License, or * +- * (at your option) any later version. * +- * * +- ***************************************************************************/ +- +-//int doesFileExists2(char *szPath); +-//int locateProgram(char *szResultPath, int nPathLen, char *szBin); +-int execProgram(char *szProgram, char *argv[], char *szOutput, int nMaxOutput); +diff -Naur qtparted-0.4.5.orig/src/statistics.cpp qtparted-0.4.5/src/statistics.cpp +--- qtparted-0.4.5.orig/src/statistics.cpp 2005-08-10 13:05:37.000000000 +0200 ++++ qtparted-0.4.5/src/statistics.cpp 2005-10-15 12:35:30.000000000 +0200 +@@ -1,16 +1,16 @@ + /*************************************************************************** +- statistics.cpp - description +- ------------------- +- begin : Wed Sep 4 19:21:54 UTC 2002 +- copyright : (C) 2002 by Francois Dupoux +- email : fdupoux@partimage.org ++ statistics.cpp - description ++ ------------------- ++ begin : Wed Sep 4 19:21:54 UTC 2002 ++ copyright : (C) 2002 by Francois Dupoux ++ email : fdupoux@partimage.org + ***************************************************************************/ + + /*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * +- * the Free Software Foundation; either version 2 of the License, or * ++ * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ +@@ -45,8 +45,8 @@ + a = getFsUsedKiloBytes(partinfo); + + /*printf ("device(%s)=%lu KB used\n", partinfo->partname().latin1(), a);*/ +- if (a == 0) return -1; +- else return a * KBYTE_SECTORS; ++ if (a == 0) return -1; ++ else return a * KBYTE_SECTORS; + } + + //------------------------------------------------ +@@ -54,117 +54,76 @@ + // security: if already mounted + umount(szMountPoint); + +- int nRes; ++ char type[255]; + +- char type[255]; +- +- if (((partinfo->fsspec->name().compare("fat32") == 0) +- || (partinfo->fsspec->name().compare("fat16") == 0))) { +- strcpy(type, "vfat"); +- } else { +- strcpy(type, partinfo->fsspec->name().latin1()); +- } +- nRes=mount(partinfo->partname().latin1(), +- szMountPoint, type, MS_NOATIME | MS_RDONLY, NULL); +- /*fprintf (stderr, "debug: try mount %s as %s --> %d\n", partinfo->partname().latin1(), +- type, nRes);*/ +- if (nRes == 0) // if success +- return 0; // success +- +- return -1; // failure ++ if (((partinfo->fsspec->name().compare("fat32") == 0) ++ || (partinfo->fsspec->name().compare("fat16") == 0))) { ++ strcpy(type, "vfat"); ++ } else { ++ strcpy(type, partinfo->fsspec->name().latin1()); ++ } ++ return mount(partinfo->partname().latin1(), ++ szMountPoint, type, MS_NOATIME | MS_RDONLY, NULL); + } + +-//------------------------------------------------ +-int isMounted(QP_PartInfo *partinfo, char *szMountPoint) { +- FILE *f; +- struct mntent *mnt; +- bool bMounted; +- char szBuf1 [MAXPATHLEN+1]; +- char szBuf2 [MAXPATHLEN+1]; +- +- // init +- bMounted = false; +- memset(szBuf1, 0, MAXPATHLEN); +- memset(szBuf2, 0, MAXPATHLEN); +- +- if ((f = setmntent (MOUNTED, "r")) == 0) +- return (-1); +- +- // loop: compare device with each mounted device +- while (((mnt = getmntent (f)) != 0) && (!bMounted)) { +- +- /*---try to see if the shortname match---*/ +- if ((partinfo->shortname().compare(mnt->mnt_fsname) == 0)) { +- bMounted = true; +- strcpy(szMountPoint, mnt->mnt_dir); +- } +- +- /*---if there is devfs try to see if the longname match---*/ +- if (isDevfsEnabled()) { +- if ((partinfo->longname().compare(mnt->mnt_fsname) == 0)) { +- bMounted = true; +- strcpy(szMountPoint, mnt->mnt_dir); +- } +- } +- } +- +- endmntent (f); +- +- return bMounted; ++//--------------------------------------- ++QString mountPoint(QP_PartInfo *partinfo) { ++ FILE *f; ++ struct mntent *mnt; ++ ++ if ((f = setmntent (MOUNTED, "r")) == 0) ++ return QString::null; ++ ++ // loop: compare device with each mounted device ++ while (((mnt = getmntent (f)) != 0)) { ++ if ((partinfo->shortname().compare(mnt->mnt_fsname) == 0) || (isDevfsEnabled() && (partinfo->longname().compare(mnt->mnt_fsname) == 0))) { ++ endmntent(f); ++ return mnt->mnt_dir; ++ } ++ } ++ endmntent(f); ++ return QString::null; + } + + //------------------------------------------------ + unsigned long getFsUsedKiloBytes(QP_PartInfo *partinfo) { +- struct statfs sfs; +- char szMountPoint[MAXPATHLEN+1]; +- unsigned long long a, b, c; +- int bMounted; +- int bToBeUnmounted; +- int nRes; +- unsigned long lResult = 0; // to be returned +- +- // init +- memset(szMountPoint, 0, MAXPATHLEN+1); +- bToBeUnmounted = false; +- +- bMounted = isMounted(partinfo, szMountPoint); +- +- /*---if not mounted -> mount it---*/ +- if (!bMounted) { +- mkdir (TMP_MOUNTPOINT, 755); +- memset(szMountPoint, 0, sizeof(szMountPoint)-1); +- snprintf(szMountPoint, sizeof(szMountPoint)-1, "%s", TMP_MOUNTPOINT); +- nRes = my_mount(partinfo, TMP_MOUNTPOINT); +- /*if (nRes != 0) +- fprintf (stderr, "debug: cannot mount device %s\n", partinfo->partname().latin1());*/ +- bToBeUnmounted = (nRes == 0); +- bMounted =(nRes == 0); +- } +- +- // if the partition is mounted (naturally or not) +- if (bMounted) { +- if (statfs(szMountPoint, &sfs) != -1) { +- a = (sfs.f_blocks - sfs.f_bavail); // used blocks count +- b = a * sfs.f_bsize; // used bytes count +- c = b / 1024LL; // user KiloBytes count +- lResult = c; +- } /*else { +- fprintf (stderr, "debug: statfs error on device %s\n", partinfo->partname().latin1()); +- }*/ +- +- if (bToBeUnmounted) { +- nRes = umount(szMountPoint); +- if (nRes != 0) { +- QString label = QString(QObject::tr("Cannot umount partition device: %1." +- "Please do it by hand first to commit the changes!")) +- .arg(partinfo->partname()); +- QMessageBox::information(NULL, PROG_NAME, label); +- } +- } +- +- return lResult; // success +- } else { +- // error -> partition not mounted +- return 0L; // failure +- } ++ struct statfs sfs; ++ unsigned long long a, b, c; ++ bool bToBeUnmounted; ++ unsigned long lResult = 0; // to be returned ++ QString mnt; ++ ++ // init ++ bToBeUnmounted = false; ++ ++ mnt = mountPoint(partinfo); ++ ++ /*---if not mounted -> mount it---*/ ++ if (mnt.isEmpty()) { ++ mkdir (TMP_MOUNTPOINT, 755); ++ int nRes = my_mount(partinfo, TMP_MOUNTPOINT); ++ if(nRes != 0) // Can't mount --> can't get statistics ++ return 0L; ++ bToBeUnmounted = (nRes == 0); ++ mnt = TMP_MOUNTPOINT; ++ } ++ ++ if (statfs(mnt, &sfs) != -1) { ++ a = (sfs.f_blocks - sfs.f_bavail); // used blocks count ++ b = a * sfs.f_bsize; // used bytes count ++ c = b / 1024LL; // user KiloBytes count ++ lResult = c; ++ } ++ ++ if (bToBeUnmounted) { ++ int nRes = umount(mnt); ++ if (nRes != 0) { ++ QString label = QObject::tr("Cannot umount partition device: %1." ++ "Please do it by hand first to commit the changes!") ++ .arg(partinfo->partname()); ++ QMessageBox::information(NULL, PROG_NAME, label); ++ } ++ } ++ ++ return lResult; // success + } +diff -Naur qtparted-0.4.5.orig/src/statistics.h qtparted-0.4.5/src/statistics.h +--- qtparted-0.4.5.orig/src/statistics.h 2003-08-27 18:13:21.000000000 +0200 ++++ qtparted-0.4.5/src/statistics.h 2005-10-15 12:06:06.000000000 +0200 +@@ -3,7 +3,9 @@ + ------------------- + begin : Wed Sep 4 19:21:54 UTC 2002 + copyright : (C) 2002 by Francois Dupoux ++ (C) 2005 by Bernhard Rosenkraenzer + email : fdupoux@partimage.org ++ bero@arklinux.org + ***************************************************************************/ + + /*************************************************************************** +@@ -17,7 +19,7 @@ + + #include "qp_libparted.h" + +-int isMounted(QP_PartInfo *, char *szMountPoint); ++QString mountPoint(QP_PartInfo *); + unsigned long getFsUsedKiloBytes(QP_PartInfo *); + int my_mount(QP_PartInfo *, char *szMountPoint); + PedSector space_stats(QP_PartInfo *); } From crazy at frugalware.org Thu Jun 1 01:05:51 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 01:05:53 2006 Subject: [Frugalware-darcs] frugalware-current: kdebindings-3.5.3-1-i686 Message-ID: <20060531230551.63641FB401A@genesis.frugalware.org> [kdebindings-3.5.3-1-i686 crazy **20060531230246 * Version bump ] { hunk ./source/kde/kdebindings/FrugalBuild 1 -# Last Modified: Thu, 30 Mar 2006 06:21:58 +0200 +# Last Modified: Thu, 01 Jun 2006 00:56:56 +0200 hunk ./source/kde/kdebindings/FrugalBuild 6 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./source/kde/kdebindings/FrugalBuild 11 -[ "$CARCH" != "x86_64" ] && makedepends=('j2sdk' 'gtk+' 'gcc-gcj' 'ruby' 'mozilla') +[ "$CARCH" != "x86_64" ] && makedepends=('j2sdk' 'gtk+' 'gcc-gcj' 'ruby' 'seamonkey') hunk ./source/kde/kdebindings/FrugalBuild 13 -depends=('kdebase>=3.5.2-1' 'qscintilla') +depends=('kdebase>=3.5.3' 'qscintilla') hunk ./source/kde/kdebindings/FrugalBuild 16 -sha1sums=('f1b0180d8005b9497cd8549f260b30f43e08ed4b') +sha1sums=('e8081576cfb148f508c31e6e3b075d75b11f3577') hunk ./source/kde/kdebindings/FrugalBuild 27 - --disable-debug \ + --disable-{debug,warnings} \ } From crazy at frugalware.org Thu Jun 1 01:19:23 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 01:19:26 2006 Subject: [Frugalware-darcs] frugalware-current: kdebindings-3.5.3-1-i686 Message-ID: <20060531231923.E683AFB401A@genesis.frugalware.org> [kdebindings-3.5.3-1-i686 crazy **20060531231750 * corrected SBU ] { hunk ./source/kde/kdebindings/FrugalBuild 2 -# Compiling Time: 11.32 SBU +# Compiling Time: 15.22 SBU } From crazy at frugalware.org Thu Jun 1 01:21:47 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 01:21:48 2006 Subject: [Frugalware-darcs] frugalware-current: kdeaccessibility-3.5.3-1-i686 Message-ID: <20060531232147.58143FB4017@genesis.frugalware.org> [kdeaccessibility-3.5.3-1-i686 crazy **20060531232015 * Version bump ] { hunk ./extra/source/kde/kdeaccessibility/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 03:34:57 +0200 -# Compiling Time: 1.10 SBU +# Last Modified: Thu, 01 Jun 2006 01:17:08 +0200 +# Compiling Time: 2.37 SBU hunk ./extra/source/kde/kdeaccessibility/FrugalBuild 6 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdeaccessibility/FrugalBuild 11 -depends=('kdebase>=3.5.2' 'akode' 'festival' 'libxtst') +depends=('kdebase>=3.5.3' 'akode' 'festival' 'libxtst') hunk ./extra/source/kde/kdeaccessibility/FrugalBuild 15 -sha1sums=('85fbf169cdcbcba6fc380ceeeb5067724aeb391b') hunk ./extra/source/kde/kdeaccessibility/FrugalBuild 16 +sha1sums=('267c280558780c198d6c429be7e157cb246f2709') hunk ./extra/source/kde/kdeaccessibility/FrugalBuild 23 - -# optimalization OK + +# optimization OK } From crazy at frugalware.org Thu Jun 1 01:39:17 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 01:39:20 2006 Subject: [Frugalware-darcs] frugalware-current: kdeaccessibility-docs-3.5.3-1-i686 Message-ID: <20060531233917.F02D1FB401A@genesis.frugalware.org> [kdeaccessibility-docs-3.5.3-1-i686 crazy **20060531233541 * Version bump ] { hunk ./extra/source/kde/kdeaccessibility-docs/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 07:50:53 +0200 +# Last Modified: Thu, 01 Jun 2006 01:34:09 +0200 hunk ./extra/source/kde/kdeaccessibility-docs/FrugalBuild 7 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdeaccessibility-docs/FrugalBuild 12 -rodepends=('kdeaccessibility>=3.5.2') -makedepends=('kdelibs>=3.5.2') -sha1sums=('85fbf169cdcbcba6fc380ceeeb5067724aeb391b') +rodepends=('kdeaccessibility>=3.5.3') +makedepends=('kdelibs>=3.5.3') hunk ./extra/source/kde/kdeaccessibility-docs/FrugalBuild 16 +sha1sums=('267c280558780c198d6c429be7e157cb246f2709') hunk ./extra/source/kde/kdeaccessibility-docs/FrugalBuild 25 -# vim: ft=sh - -# optimalization OK } From crazy at frugalware.org Thu Jun 1 01:53:38 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 01:53:40 2006 Subject: [Frugalware-darcs] frugalware-current: kdeaddons-docs-3.5.3-1-i686 Message-ID: <20060531235338.519D3FB4017@genesis.frugalware.org> [kdeaddons-docs-3.5.3-1-i686 crazy **20060531235157 * Version bump ] { hunk ./extra/source/kde/kdeaddons-docs/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 07:56:17 +0200 +# Last Modified: Thu, 01 Jun 2006 01:50:45 +0200 hunk ./extra/source/kde/kdeaddons-docs/FrugalBuild 7 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdeaddons-docs/FrugalBuild 12 -rodepends=('kdeaddons>=3.5.2') -makedepends=('kdelibs>=3.5.2') +rodepends=('kdeaddons>=3.5.3') +makedepends=('kdelibs>=3.5.3') hunk ./extra/source/kde/kdeaddons-docs/FrugalBuild 16 -sha1sums=('9d47ca0accdb37aa5c1f05dccd2991119800dbc8') +sha1sums=('fd202fd051983765ec7b38bf0d5a7ac4c36cfb1f') hunk ./extra/source/kde/kdeaddons-docs/FrugalBuild 28 -# vim: ft=sh - -# optimalization OK - } From crazy at frugalware.org Thu Jun 1 02:16:07 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 02:16:09 2006 Subject: [Frugalware-darcs] frugalware-current: kdeadmin-docs-3.5.3-1-i686 Message-ID: <20060601001607.34C22FB4017@genesis.frugalware.org> [kdeadmin-docs-3.5.3-1-i686 crazy **20060601000952 * Version bump ] { hunk ./extra/source/kde/kdeadmin-docs/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 08:01:17 +0200 +# Last Modified: Thu, 01 Jun 2006 02:08:29 +0200 hunk ./extra/source/kde/kdeadmin-docs/FrugalBuild 7 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdeadmin-docs/FrugalBuild 12 -rodepends=('kdeadmin>=3.5.2') -makedepends=('kdelibs>=3.5.2') +rodepends=('kdeadmin>=3.5.3') +makedepends=('kdelibs>=3.5.3') hunk ./extra/source/kde/kdeadmin-docs/FrugalBuild 16 -sha1sums=('e7507312b7124ba60380354be98bb323e203d362') +sha1sums=('1ddc33a75702aaf0c8e7a35eefe04aae2835971c') hunk ./extra/source/kde/kdeadmin-docs/FrugalBuild 24 -# optimalization OK - } From crazy at frugalware.org Thu Jun 1 02:56:05 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 02:56:07 2006 Subject: [Frugalware-darcs] frugalware-current: kdebase-docs-3.5.3-1-i686 Message-ID: <20060601005605.2D6B0FB4017@genesis.frugalware.org> [kdebase-docs-3.5.3-1-i686 crazy **20060601005351 * Version bump ] { hunk ./extra/source/kde/kdebase-docs/FrugalBuild 1 -# Last modified: Fri, 31 Mar 2006 08:12:25 +0200 +# Last modified: Thu, 01 Jun 2006 02:36:52 +0200 hunk ./extra/source/kde/kdebase-docs/FrugalBuild 7 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdebase-docs/FrugalBuild 10 -rodepends=('kdebase>=3.5.2') -makedepends=('kdelibs>=3.5.2') +rodepends=('kdebase>=3.5.3') +makedepends=('kdelibs>=3.5.3') hunk ./extra/source/kde/kdebase-docs/FrugalBuild 16 -sha1sums=('16cddd8766c3bd8821044fe9cce66f5291c8412b') +sha1sums=('93f1566343af114b24987ee7b8e0e80877b57f25') hunk ./extra/source/kde/kdebase-docs/FrugalBuild 30 -# optimalization OK - } From crazy at frugalware.org Thu Jun 1 03:28:12 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 03:28:15 2006 Subject: [Frugalware-darcs] frugalware-current: kdeedu-docs-3.5.3-1-i686 Message-ID: <20060601012812.99819FB4017@genesis.frugalware.org> [kdeedu-docs-3.5.3-1-i686 crazy **20060601011720 * Version bump ] { hunk ./extra/source/kde/kdeedu-docs/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 08:26:09 +0200 +# Last Modified: Thu, 01 Jun 2006 03:15:41 +0200 hunk ./extra/source/kde/kdeedu-docs/FrugalBuild 7 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdeedu-docs/FrugalBuild 12 -rodepends=('kdeedu>=3.5.2') -makedepends=('kdelibs>=3.5.2') +rodepends=('kdeedu>=3.5.3') +makedepends=('kdelibs>=3.5.3') hunk ./extra/source/kde/kdeedu-docs/FrugalBuild 16 -sha1sums=('774ed93b20a8b61606e18ec7f752fefc6a5cb7a9') +sha1sums=('99ccf43ac130cbf2fbcdf07ca87d20fccf017123') hunk ./extra/source/kde/kdeedu-docs/FrugalBuild 27 -# vim: ft=sh - -# optimalization OK - } From crazy at frugalware.org Thu Jun 1 04:08:54 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 04:08:57 2006 Subject: [Frugalware-darcs] frugalware-current: kdegraphics-docs-3.5.3-1-i686 Message-ID: <20060601020854.C482FFB4017@genesis.frugalware.org> [kdegraphics-docs-3.5.3-1-i686 crazy **20060601020511 * Version bump ] { hunk ./extra/source/kde/kdegraphics-docs/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 08:32:02 +0200 +# Last Modified: Thu, 01 Jun 2006 04:03:57 +0200 hunk ./extra/source/kde/kdegraphics-docs/FrugalBuild 7 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdegraphics-docs/FrugalBuild 12 -rodepends=('kdegraphics>=3.5.2') -makedepends=('kdelibs>=3.5.2') +rodepends=('kdegraphics>=3.5.3') +makedepends=('kdelibs>=3.5.3') hunk ./extra/source/kde/kdegraphics-docs/FrugalBuild 16 -sha1sums=('80703d46fd90b7ab95f92d7b7c411a04f431d13b') +sha1sums=('7ea559a592bfcd914cc9c1ef923bcc63f2db7c2c') hunk ./extra/source/kde/kdegraphics-docs/FrugalBuild 27 -# vim: ft=sh - -# optimalization OK - } From crazy at frugalware.org Thu Jun 1 04:21:15 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 04:21:17 2006 Subject: [Frugalware-darcs] frugalware-current: kdemultimedia-docs-3.5.3-1-i686 Message-ID: <20060601022115.93CFAFB4017@genesis.frugalware.org> [kdemultimedia-docs-3.5.3-1-i686 crazy **20060601021804 * Version bump ] { hunk ./extra/source/kde/kdemultimedia-docs/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 08:38:01 +0200 +# Last Modified: Thu, 01 Jun 2006 04:17:41 +0200 hunk ./extra/source/kde/kdemultimedia-docs/FrugalBuild 7 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdemultimedia-docs/FrugalBuild 12 -rodepends=('kdemultimedia>=3.5.2') -makedepends=('kdelibs>=3.5.2') +rodepends=('kdemultimedia>=3.5.3') +makedepends=('kdelibs>=3.5.3') hunk ./extra/source/kde/kdemultimedia-docs/FrugalBuild 16 -sha1sums=('68e5e24709a2c06777bb3f12fc76e733f5896c5d') +sha1sums=('2a75ba49bbc513b4ab5cb0d039949984742f94f5') hunk ./extra/source/kde/kdemultimedia-docs/FrugalBuild 30 -# vim: ft=sh -# optimalization OK - } From crazy at frugalware.org Thu Jun 1 04:35:55 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 04:35:58 2006 Subject: [Frugalware-darcs] frugalware-current: kdesdk-3.5.3-1-i686 Message-ID: <20060601023556.10FD5FB4017@genesis.frugalware.org> [kdesdk-3.5.3-1-i686 crazy **20060601022924 * Version bump * TMP killed off svn from depends() -- some SMART KDE devel just use some svn-config switches are NOT -- implemented YET meh! ( I'll prepare a patch for that soon ) ] { hunk ./extra/source/kde/kdesdk/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 05:53:38 +0200 +# Last Modified: Thu, 01 Jun 2006 04:26:26 +0200 hunk ./extra/source/kde/kdesdk/FrugalBuild 6 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdesdk/FrugalBuild 11 -depends=('kdebase>=3.5.2' 'db' 'subversion') +depends=('kdebase>=3.5.3' 'db') hunk ./extra/source/kde/kdesdk/FrugalBuild 13 -Finclude kde hunk ./extra/source/kde/kdesdk/FrugalBuild 14 -sha1sums=('463975860e7881f2d67c20ec2f5f2e34858e5966') +Finclude kde +sha1sums=('6d463bff975605bef1ab89fe78ce6d9a8284fb64') hunk ./extra/source/kde/kdesdk/FrugalBuild 17 -Fconfopts="$Fconfopts \ - --enable-new-ldflags \ - --with-subversion \ - --with-berkeley-db \ - --with-apr-config=/usr/bin/apr-1-config \ - --with-apu-config=/usr/bin/apu-1-config" +build() +{ + Fcd + #make -f Makefile.cvs || return 1 + Fbuild CXXFLAGS="$CXXFLAGS -Wno-deprecated" \ + --disable-dependency-tracking \ + --disable-debug \ + --without-debug \ + --disable-warnings \ + --with-gnu-ld \ + --enable-gcc-hidden-visibility \ + DO_NOT_COMPILE="doc" \ + --with-berkeley-db + #--with-apr-config=/usr/bin/apr-1-config \ + #--with-apu-config=/usr/bin/apu-1-config +} hunk ./extra/source/kde/kdesdk/FrugalBuild 34 -# optimalization OK +# optimization OK } From alex.extreme2 at gmail.com Thu Jun 1 08:28:51 2006 From: alex.extreme2 at gmail.com (alex_extreme) Date: Thu Jun 1 08:28:54 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: added media.php Message-ID: <20060601062851.E846BFB4017@genesis.frugalware.org> [fwng: added media.php alex_extreme **20060601062634] { hunk ./frugalware/config.inc.php 33 +$menucontent .= ' ' . gettext('Frugalware in the Press') . "\n"; addfile ./frugalware/media.php hunk ./frugalware/media.php 1 + + * @copyright Copyright (C) 2006 Alex Smith + */ + +// Include some useful functions +include('functions.inc.php'); + +$lang = getlang(); +$llang = getllang($lang); +$flang = ( $lang == 'en' ) ? "" : "_$lang"; +$xmlfile = 'xml/media.xml'; + +// Set the locale settings for gettext +putenv("LANG=".$llang); +setlocale(LC_ALL,$llang); +$domain = 'messages'; +bindtextdomain($domain, 'locale'); +textdomain($domain); + +// Include the config and start the page +include('config.inc.php'); +include('header.php'); + +// This includes the XML parser +include('xml.inc.php'); + +// Let's see whether the media file exist or not +if (!file_exists($xmlfile)) { + + echo(gettext('Sorry, a media file has not been written yet.')); + include('footer.php'); + die(); + +} + +fwmiddlebox(gettext('Frugalware in the press'), + gettext('This page contains details about some of the articles that have been posted on the Internet about Frugalware. If you find an article not listed here, please tell us about it!')); + +$xml = file_get_contents($xmlfile); +$parser = new XMLParser($xml); +$parser->Parse(); +$media = $parser->document->article; + +// The parser creates too long and unuseful object hierarchy, so create a better-readable one. +for ( $i = 0; $i < count($media); $i++) { + + $articles[$i][date] = $media[$i]->date[0]->tagData; + $articles[$i][language] = $media[$i]->language[0]->tagData; + $articles[$i][where] = $media[$i]->where[0]->tagData; + $articles[$i][title] = $media[$i]->title[0]->tagData; + $articles[$i][link] = $media[$i]->link[0]->tagData; + +} + +// Let's write out details of each article in a separate box +for( $i = 0; $i < count($articles); $i++ ) { + + fwmiddlebox($articles[$i][where] . ' - ' . $articles[$i][title], + ' + + + + +
' . gettext('Title') . ':' . $articles[$i][title] . '
' . gettext('Where') . ':' . $articles[$i][where] . '
' . gettext('Date') . ':' . $articles[$i][date] . '
' . gettext('Language') . ':' . $articles[$i][language] . '
' . gettext('Link') . ':' . $articles[$i][link] . '
'); + +} + +include("footer.php"); +?> } From alex.extreme2 at gmail.com Thu Jun 1 08:35:16 2006 From: alex.extreme2 at gmail.com (alex_extreme) Date: Thu Jun 1 08:35:18 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: added TODO list Message-ID: <20060601063516.3C09DFB4017@genesis.frugalware.org> [fwng: added TODO list alex_extreme **20060601063457] { addfile ./frugalware/TODO hunk ./frugalware/TODO 1 +TODO for Homepage-NG +==================== + + * irc.php - IroNiQ is doing this + * donations.php - AlexExtreme will do this + * changelog.php - ?? will do this + * docs.php - ?? will do this + * Cleanup the code - AlexExtreme will do this } From iron at frugalware.org Thu Jun 1 09:33:38 2006 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jun 1 09:33:40 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: another code cleanup and added irc.php Message-ID: <20060601073338.27DD7FB4017@genesis.frugalware.org> [fwng: another code cleanup and added irc.php Krisztian VASAS **20060601073149 - removed stupid "100%px" from fwng.css - cleaned $langcontent and infobox content - added irc.php ] { hunk ./frugalware/TODO 4 - * irc.php - IroNiQ is doing this hunk ./frugalware/config.inc.php 25 - Go Frugalware, Go
- Valid XHTML 1.0!
- Valid CSS!' . "\n"; + Go Frugalware, Go
+ Valid XHTML 1.0!
+ Valid CSS! + '; hunk ./frugalware/config.inc.php 43 -$menucontent .= ' ' . gettext('IRC') . "\n"; +$menucontent .= ' ' . gettext('IRC') . "\n"; hunk ./frugalware/config.inc.php 64 -$langcontent = '
' . gettext('Change language') . ' | ' . gettext('Change language') . '
'; +$langcontent = '
+ ' . gettext('Change language') . ' + | + ' . gettext('Change language') . ' +
'; hunk ./frugalware/fwng.css 105 - width: 100%px; } From iron at frugalware.org Thu Jun 1 09:34:50 2006 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jun 1 09:34:53 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: forgot to add irc.php Message-ID: <20060601073450.D6D7EFB4017@genesis.frugalware.org> [fwng: forgot to add irc.php Krisztian VASAS **20060601073432] { addfile ./frugalware/irc.php hunk ./frugalware/irc.php 1 + + * @author Miklos Vajna + * + * @copyright Copyright (c) 2006. Krisztian VASAS + * @copyright Copyright (c) 2005-2006. Miklos Vajna + */ + +// include some useful functions +include("functions.inc.php"); + +$lang = getlang(); +$llang = getllang($lang); + +// set the locale settings for gettext +putenv("LANG=".$llang); +setlocale(LC_ALL,$llang); +$domain = 'messages'; +bindtextdomain($domain, "locale"); +textdomain($domain); + +// include the config and let's start page +include("config.inc.php"); +include("header.php"); + +fwmiddlebox(gettext("General information"), gettext("Our irc channel is on the freenode network (server: irc.freenode.net), at #frugalware. This is the official Frugalware Linux irc help station.")); + +$ircont = " + + + +
+ +
+ + + + + + + + + + + + + + + + + +
".gettext("Nickname:")."
".gettext("Server:")."
".gettext("Channel:")."
".gettext("Advanced...")."
+
+
\n"; + +fwmiddlebox(gettext("Login via web"), $ircont); +fwmiddlebox(gettext("Social diagram"), "\"Social"); + +$logcont = ""; +if ($dir = @opendir("/home/xbit/public_html/irclog")) +{ + while ($file = readdir($dir)) + { + if ($file != "." and $file != ".." and $file != "log.html") + { + $month = preg_replace("/3-0-([0-9]*)-([0-9]*)-([0-9]*)\.html/", "$3-$1", $file); + if (!isset($logs[$month])) + $logs[$month]=array(); + $logs[$month][]=$file; + } + } + closedir($dir); + + $logcont .= "
"; + foreach($logs as $key => $value) + { + $logcont .= "
$key"; + foreach($value as $i) + $logcont .= "" . preg_replace("/3-0-([0-9]*)-([0-9]*)-([0-9]*)\.html/", "$2", $i) . ""; + } + $logcont .= "
"; + $logcont .= sprintf($fwstrirclogd, "/~xbit/irclog/log.html"); +} + +if ($logcont == "" ) + fwmiddlebox(gettext("Log of the channel: #frugalware"), gettext("Sorry, currently no log available")); +else + fwmiddlebox(gettext("Log of the channel: #frugalware"), $logcont); + +include("footer.php"); +?> } From vmiklos at frugalware.org Thu Jun 1 11:34:17 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 11:34:19 2006 Subject: [Frugalware-darcs] frugalware-current: j2re-5.0_07-1-i686 Message-ID: <20060601093417.67014FB4017@genesis.frugalware.org> [j2re-5.0_07-1-i686 VMiklos **20060601093307 version bump ] { hunk ./source/apps/j2re/FrugalBuild 1 -# Last Modified: Sun, 04 Dec 2005 16:54:30 +0100 +# Last Modified: Thu, 01 Jun 2006 11:30:05 +0200 hunk ./source/apps/j2re/FrugalBuild 6 -pkgver=5.0_06 -oldpkgver=1.5.0_06 # 1.5 = 5.0 +pkgver=5.0_07 +oldpkgver=1.5.0_07 # 1.5 = 5.0 hunk ./source/apps/j2re/FrugalBuild 17 -jarch=i586 && jsha1=8244fe7a97647a19f43dd527d975650eb16800c9 -[ "$CARCH" == "x86_64" ] && jarch=amd64 && jsha1=19b55fb7a0133ef8347741bcd6eb83d88ae266dd +jarch=i586 && jsha1=3be9ba52c982a4a22f036f587e96418234399a0f +[ "$CARCH" == "x86_64" ] && jarch=amd64 && jsha1=3be9ba52c982a4a22f036f587e96418234399a0f } From crazy at frugalware.org Thu Jun 1 12:15:06 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 12:15:08 2006 Subject: [Frugalware-darcs] frugalware-current: kde-i18n-3.5.3-1-i686 Message-ID: <20060601101506.357FDFB4017@genesis.frugalware.org> [kde-i18n-3.5.3-1-i686 crazy **20060601100401 * Version bump ] { hunk ./extra/source/locale/kde-i18n/FrugalBuild 1 -# Last Modified: Tue, 09 May 2006 19:51:38 +0200 +# Last Modified: Thu, 01 Jun 2006 05:54:12 +0200 hunk ./extra/source/locale/kde-i18n/FrugalBuild 6 -pkgver=3.5.2 -pkgrel=3 +pkgver=3.5.3 +pkgrel=1 hunk ./extra/source/locale/kde-i18n/FrugalBuild 28 -sha1sums=('600d72535d39d997e60ac7a89de0b202d28b7c57' \ - '18faa2cda50a2c4b8ab274557dbe0b79c53e10c9' \ - '6f487fe5c8ea7e17d6f30ecb7d72961f30710a34' \ - 'fe68fac7508e44d0f133d40c6b5a33c4af31b87c' \ - 'acdb4e169848f5ed83e8ab77f19b8e2eb4852664' \ - '6e9e66eb358d1a8fc89b68b16c01109f5ee4e967' \ - '1bbe5f282e2f40fc7bf0fd1ca01201ce5eba0a99' \ - '36c7a3f678b1480c338b5da7493902f60a3781e5' \ - '9906eb72a51a9f6a867ef3f637193d622ef1564f' \ - 'e45c726d3c2e9427abd013b2d74c9e52041029f9' \ - '96aa3ee54044498d9eb62807e24f11e5a52cefd0' \ - 'c1f5f7b1ab00118772c7e0c13fb60c12ac069a2b' \ - 'b1b6348e3bfaea31400963e0bf33c5d2c7c0155c' \ - '6ffd19dac77bb89cf7a6fce770c707e360e69c46' \ - '5dfdcee264a513018490f1e7b0077cd0cab5dbbf' \ - '5aa136f8e01f36fdef3625d365988cb675b2accd' \ - 'd7f0f9b7f860a561bd4cc68e36636ad0750cb034' \ - '333730eb6b1c88f71a2b81fd1611ae645bbbf6c1' \ - 'e494147cb0a98053f7cdc9a82110987449544144' \ - 'd8f92a60eaafd114e1d496293cc65c1fc2df5a76' \ - '34ab9b644b72ccfae05c8d6cb9bf3169e6572293' \ - '0cca3ffcc2406fcc4063d4c5a9ce1cb80f3fe928' \ - '8231d5f2c88a6a668bfd06e6baeb6c1ac33f6c5f' \ - 'efc6d81a4a1798acd4efc33fbed36036eacc0d69' \ - '823def58ec4bf3851c0abd183ad7ab6ea21b7670' \ - '856fb41a218b32e3a7953858285767b5ac8f2fe1' \ - '499ec8683256fd0009451ec908e33c6660135ec5' \ - 'f4d526809c39f0e4d93f96c2bb6fcf1c7e8a5866' \ - '5faed0b02e81ed2d73fda8ad54ec823e25cea647' \ - '6dfa92b4bcba5b08df3779c914788ae856a391d0' \ - 'a2ca33bc1a1fc422befdfdff19e27524ea0b72a0' \ - '9976077f391660aa1e493945a8d516f462cecc2b' \ - '934320b952a458946b3176b8ea5cea0cdbb6d772' \ - 'e46ab8e991f9c575a4c474ec376713a57349e07a' \ - '66b5e9cf08f387f1fc36e949d02f85fc79d34b96' \ - 'd25810b7cc748f27aea592d85eeaf67628a8796c' \ - '0845c512342cdbb013cdb23cf87e03829a35f93d' \ - 'c48c35fa89847b74a8c77afb2001a3631d53cc7e' \ - '23aed600caf4b191fa689c8bd1201fa684fcc19e' \ - 'f9695e0c3bb030634bf2dc978e4cdc86fe1a903f' \ - '4f2dc0d6028a67b786673fea28f0c7629e5a2a62' \ - '656bb22f9a795b1cc5e040ba57208b156752b90e' \ - '3f51614143cead2029536be9b4e34efc77f491c7' \ - '129cd430c10c5bab4b7a7f7862a94712d7cad52a' \ - '140f6ac73bb61da709a96d3babf1da3445c5ac97' \ - '9ce66a2d3a1c354063b14bbab724f0fb763487db' \ - '9132408e0f4734eb06dd33ce220a546aeb1b3351' \ - '6757e2465d8559e36ced786f05f9d41f635ad3c5' \ - '864907b6d9169d80c2872e5415c9a6427b180c2d' \ - '5e23c1b6bb455e218d8670ec780a0be5ff7b6f09' \ - '7b7501db9f10cd6172d09aa177187ff7467fd681' \ - '8ada5623e2c6ff51c759311e82dd08cd81669461' \ - '40c1f81f8d2d5d7fecc51b3669181d795bc6bfc7' \ - 'fe7e9bc84253acac6aea8f07f6d328c2fdcff6b7' \ - '748bd58ef3c2032b4d6a98331249631bf365df91' \ - '7845ba576d483f77a897ba769aa6c69e82becb50' \ - '2cab38beae43d749afa62c7de22721d2edae1b6f' \ - '2d9722443c8a7a1db99b8f0bbbe77e4f84ec9703' \ - '932a85ca1088599dc368277f60a7ef994227085c' \ - '1f607e307ec4a1fb260f3f71c3b7eeea0f4bd3c4' \ - '9ff5950ce554e91393c631a84d077a0b7266c158' \ - 'd73e4775a44c7d067905e674938c72508732edef' \ - 'd2a91cdc52f4a6a47149ac65ebdfdf4a14097d9f') +sha1sums=('41fcddf608f5bdfeb67c5b07b574704476f2dfbc' \ + 'adfebec28b1b39635b00ab66d2209e9fdb8135f3' \ + 'af0463f83775e2185ad92cc27d43b81cd2388a7f' \ + 'e80e0bd8291dd5e75dac66d33b55d8cef336c7b2' \ + '0234cf85858ff828f5c901ed33ba5418aa849414' \ + '7fba5271b58fea9fa86ee5c0e9bb21aeaea40327' \ + 'bc737027652522fb9c6059fda317d21bacdb5fd2' \ + '68c7f8bc231881971ae54cc8ce00fb373163b9ef' \ + '371f62755eed2d93982eab80f31389a0e59e5678' \ + 'ac9c290b0d106f29eb4edea21ac4b07add6d22f4' \ + '6f6b89ce05a93b4329c3593ad6d11c77b4921dc4' \ + 'bc84801be9a460eef505d28082fa3d2bc8b639a8' \ + '4aa811e78a18e945680f2e83ddc56af177412480' \ + 'e5a3a212290e5378a4c752bb5bd6d3a9685ec77c' \ + '75afd28adbf414c735476be86a7c191bc2b2eb8a' \ + 'f238a6747d3613c29b331689c360de8c79727bf4' \ + '5ba811b2a90d7038c78f8daa1c6a6744bf7b3e68' \ + '5e7fef7853c4fbc45076b338973a4e7439b98e33' \ + '58fa99eb18746dc31cb27877b2278cb250ed7b14' \ + '7f3c8ad0fd7f894bcde9082b6bfd8960f6615f4a' \ + 'cbdd2e8d16ecca264d04b70216e1936cf0839fe0' \ + '6e512a0df6c7e5c5b32ed3f43434d2ac74952e21' \ + 'aa1065a8097acd3ff1456d5f974d2b286ea4adc4' \ + '145dd7987524a5e26a09fc01f12c66f008dfa88f' \ + 'c5fd72f101164534c6886c0aa76c6f450485e5bd' \ + 'da64b030ba226713c8407aaf96c2355807ff34e9' \ + 'f7055904a54c54af4047334092892d8c2642a0ca' \ + 'b3788d67270c49474a3b332b8cf5698cc17513e5' \ + '32e00d1dc205e61145b89c1eaa74d0be8e8e65df' \ + '79c65dfece0012100b677784c2ecaa7b4661535e' \ + '1ce0db4aa71c6e0edc6bd0aec9612b3aaaf17672' \ + '961987351a411977a42a8ab631ee34205495367b' \ + '48033b461e96ddbd74977f62e52d095e4949f202' \ + '10677da057b24ec7975dc220b1fac38862e0514f' \ + '44e35347a34aa2909a71533f0ecb1f61bdd20e39' \ + '8f0f090018f4edd67422a69f30f799d62516764e' \ + 'bdd395dec2f5ecbb88fc3bf0754f4754fb49cac9' \ + '43884e0b2ea8695de34dbc382a1d63a519ad486c' \ + '390096125d58038e72e8289689d5d95365d85278' \ + '38a2e694a08f50514c275e3cb8e16d3e53d40a77' \ + '78b00147f7075a0117c6f52b99bc2d2b814de316' \ + '26869c404d89f4c3f50901387b6c78b0cb4e3477' \ + 'a67ea6097d202c3dcd908fe2a0dfb510e7b60b00' \ + 'ccb93d4e89eb752573a99ad0a98334a50dfcb389' \ + '6e785fb941c24052cf605d8afe40e51156e32d5c' \ + '0930d85bb0a7c8be8d6a270280654379b4d6eaa0' \ + '44d11c7b795150d33b57d51ec81ba8db76bc5479' \ + 'a28a1337f8f5aa5d47441acf56499f966b2965a4' \ + '9d092ba1a561019dba86aeb4033e8b41887f8509' \ + 'df492d14003a4dfa1d33e2743ac645b7ad71e3d1' \ + '5389154ae843464dec6311a830c8f5ff16b72043' \ + '3092f5969ab747b5bcb574c8c4a88d436f0a6ef9' \ + 'b2e32c411d1bce3bd2506bc5a86ce23a082715fc' \ + '2994640e9c545793b18f53f57162b81fb81b72f2' \ + '6120bf83dece104673f2f8d73d7c66ae74ccc445' \ + 'af2c4ff16ac9418039acde8f251a09b624d25dc0' \ + '9424635d7ccab31951e34d362ec02147c05d35e2' \ + '11379a9ab81dd684d16d7582800da5b7ba3a9538' \ + 'bb12d55d7c2205b320ae5ebd94b74ad170da11b1' \ + '19433aab16520453b5e72eb30b201bb88b15ba8a' \ + '522855c94972d52acf0eeab76f3c7c22e7ccc81a' \ + '231084302335cf536467b517ec4f2bbb1527bfac' \ + 'c9fb29999952a4c9716ef0224a6d8cbf9e87b844') + hunk ./extra/source/locale/kde-i18n/FrugalBuild 113 - # splitting usr/ does not work it will give you a subpkg() with /usr/usr .. - Fsplit $pkgname-$ksub usr/share + Fsplit $pkgname-$ksub /usr } From vmiklos at frugalware.org Thu Jun 1 12:39:00 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 12:39:01 2006 Subject: [Frugalware-darcs] frugalware-current: j2sdk-5.0_07-1-i686 Message-ID: <20060601103900.6EA27FB4019@genesis.frugalware.org> [j2sdk-5.0_07-1-i686 VMiklos **20060601103656 version bump ] { hunk ./source/devel/j2sdk/FrugalBuild 1 -# Last Modified: Sun, 04 Dec 2005 17:09:41 +0100 +# Last Modified: Thu, 01 Jun 2006 11:55:37 +0200 hunk ./source/devel/j2sdk/FrugalBuild 6 -pkgver=5.0_06 -oldpkgver=1.5.0_06 # 1.5 = 5.0 +pkgver=5.0_07 +oldpkgver=1.5.0_07 # 1.5 = 5.0 hunk ./source/devel/j2sdk/FrugalBuild 17 -jarch=i586 && jsha1=2539c4a15ef46178f047b2be0cb1683f70407c9a -[ "$CARCH" == "x86_64" ] && jarch=amd64 && jsha1=a2bfec8bc8dd0ce8010d361fda19b2b62215fdd5 +jarch=i586 && jsha1=4230d81744dadc8769163df67d9aa6fc88f4d574 +[ "$CARCH" == "x86_64" ] && jarch=amd64 && jsha1=697a04c373d9d6076d70d694f8ab1797b2707d59 hunk ./source/devel/j2sdk/FrugalBuild 39 -# vim: ft=sh - } From vmiklos at frugalware.org Thu Jun 1 12:52:30 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 12:52:32 2006 Subject: [Frugalware-darcs] frugalware-current: realrekord-0.9_jr3-1-i686 Message-ID: <20060601105230.59388FB4017@genesis.frugalware.org> [realrekord-0.9_jr3-1-i686 VMiklos **20060601105120 change to nobuild since it depends on realplayer, which is nobuild ] { hunk ./extra/source/kde/realrekord/FrugalBuild 15 -options=('scriptlet') +options=('scriptlet' 'nobuild') } From vmiklos at frugalware.org Thu Jun 1 14:26:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 14:26:37 2006 Subject: [Frugalware-darcs] pacman: libalpm: sortbydeps(): set cycle limit from numtargs to sqrt(numtargs) Message-ID: <20060601122634.69F87FB4019@genesis.frugalware.org> [libalpm: sortbydeps(): set cycle limit from numtargs to sqrt(numtargs) VMiklos **20060601122213 seems to be enough & it causes a big speedup ] { hunk ./lib/libalpm/deps.c 26 +#include hunk ./lib/libalpm/deps.c 116 - if(numscans > numtargs) { + if(numscans > sqrt(numtargs)) { } From crazy at frugalware.org Thu Jun 1 14:42:13 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 14:42:14 2006 Subject: [Frugalware-darcs] frugalware-current: kde-theme-qtcurve-0.36-1-i686 Message-ID: <20060601124213.7D5B0FB4017@genesis.frugalware.org> [kde-theme-qtcurve-0.36-1-i686 crazy **20060601123916 * Version bump ] { hunk ./extra/source/kde/kde-theme-qtcurve/FrugalBuild 1 -# Last modified: Fri, 21 Apr 2006 17:15:01 +0200 +# Last modified: Thu, 01 Jun 2006 13:24:52 +0200 hunk ./extra/source/kde/kde-theme-qtcurve/FrugalBuild 7 -pkgver=0.35.1 +pkgver=0.36 hunk ./extra/source/kde/kde-theme-qtcurve/FrugalBuild 18 -sha1sums=('4f941446e43f2bff2359e5df65f25653c94859db') +sha1sums=('2eaa0799db86d93651d79a643ceea65a5d7de998') hunk ./extra/source/kde/kde-theme-qtcurve/FrugalBuild 37 -# optimalization OK +# optimization OK } From crazy at frugalware.org Thu Jun 1 17:04:43 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 17:04:44 2006 Subject: [Frugalware-darcs] frugalware-current: kdepim-3.5.3-1-i686 Message-ID: <20060601150443.D2083FB4017@genesis.frugalware.org> [kdepim-3.5.3-1-i686 crazy **20060601150224 * Version bump ] { hunk ./source/kde/kdepim/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 05:20:08 +0200 -# Compiling Time: 21.21 SBU +# Last Modified: Thu, 01 Jun 2006 16:53:23 +0200 +# Compiling Time: 28.51 SBU hunk ./source/kde/kdepim/FrugalBuild 6 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./source/kde/kdepim/FrugalBuild 11 -depends=('kdebase>=3.5.2' 'gpgme' 'openssl' 'libmal' 'cyrus-sasl' 'gnokii') -makedepends=('doxygen' 'kdeaccessibility>=3.5.2' 'kdemultimedia>=3.5.2') -Finclude kde +depends=('kdebase>=3.5.3' 'gpgme' 'openssl' 'libmal' 'cyrus-sasl' 'gnokii') +makedepends=('doxygen' 'kdeaccessibility>=3.5.3' 'kdemultimedia>=3.5.3') hunk ./source/kde/kdepim/FrugalBuild 14 -sha1sums=('1907bc219d2dd51a376a99d0f7e6b9af97d5adf7') +Finclude kde +sha1sums=('c957fffefaa73e8be670b2a2d639b82205fe5309') } From janny at frugalware.org Thu Jun 1 17:45:16 2006 From: janny at frugalware.org (Janny) Date: Thu Jun 1 17:45:19 2006 Subject: [Frugalware-darcs] frugalware-current: openoffice.org Message-ID: <20060601154517.00A8EFB4017@genesis.frugalware.org> [openoffice.org Janny **20060601154457 remove docdir Fsed line ] { hunk ./source/xapps/openoffice.org/FrugalBuild 181 - - # Define right docdir - Fsed 'doc/openoffice.org' "doc/openoffice.org-$pkgver" distro-configs/Frugalware.conf.in } From crazy at frugalware.org Thu Jun 1 17:51:59 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 17:52:02 2006 Subject: [Frugalware-darcs] frugalware-current: subversion-1.3.2-1-i686 Message-ID: <20060601155200.0091DFB4017@genesis.frugalware.org> [subversion-1.3.2-1-i686 crazy **20060601154858 * Version bump * added svnserve.de * some more fixes for svn-config ] { hunk ./extra/source/devel/subversion/FrugalBuild 1 -# Last Modified: Sun, 09 Apr 2006 03:33:26 +0200 +# Last Modified: Thu, 01 Jun 2006 17:35:09 +0200 hunk ./extra/source/devel/subversion/FrugalBuild 7 -pkgver=1.3.1 -pkgrel=3 +pkgver=1.3.2 +pkgrel=1 hunk ./extra/source/devel/subversion/FrugalBuild 20 -sha1sums=('f8d670a0ae931fca17192d02862aa93a229e5dda' \ +sha1sums=('688ab178db1f6acb2ad3bd99f030402621f837b6' \ hunk ./extra/source/devel/subversion/FrugalBuild 22 - 'b4012364a9fbd9e8c490a4819780c31c67940428' ) - + 'b4012364a9fbd9e8c490a4819780c31c67940428') hunk ./extra/source/devel/subversion/FrugalBuild 45 + Fsed "SVN_SOURCE_DIR=.*" "" svn-config + Fsed "SVN_BUILD_DIR=.*" "" svn-config hunk ./extra/source/devel/subversion/FrugalBuild 78 -# optimalization OK - addfile ./extra/source/devel/subversion/messages/svnserve.de hunk ./extra/source/devel/subversion/messages/svnserve.de 1 +stopsvnserve="Stoppe svnserve" +startsvnserve="Starte svnserve" } From vmiklos at frugalware.org Thu Jun 1 17:56:15 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 17:56:17 2006 Subject: [Frugalware-darcs] frugalware-current: include/sourceforge.sh: new variable: _F_sourceforge_dirname Message-ID: <20060601155615.BF6EEFB4017@genesis.frugalware.org> [include/sourceforge.sh: new variable: _F_sourceforge_dirname VMiklos **20060601155512 requested by janny (and maybe others..) ] { hunk ./source/include/sourceforge.sh 22 +if [ -z "$_F_sourceforge_dirname" ]; then + _F_sourceforge_dirname="$name" +fi + hunk ./source/include/sourceforge.sh 33 - source=(http://${_F_sourceforge_mirror}dl.sourceforge.net/sourceforge/$name/$name-${pkgver//_/-}.tar.gz) + source=(http://${_F_sourceforge_mirror}dl.sourceforge.net/sourceforge/$_F_sourceforge_dirname/$name-${pkgver//_/-}.tar.gz) hunk ./source/include/sourceforge.sh 35 - source=(http://${_F_sourceforge_mirror}dl.sourceforge.net/sourceforge/$name/$name-${pkgver//_/-}$_F_sourceforge_ext) + source=(http://${_F_sourceforge_mirror}dl.sourceforge.net/sourceforge/$_F_sourceforge_dirname/$name-${pkgver//_/-}$_F_sourceforge_ext) hunk ./source/include/sourceforge.sh 37 -unset realname _F_sourceforge_prefix _F_sourceforge_ext _F_sourceforge_mirror +unset realname _F_sourceforge_prefix _F_sourceforge_ext _F_sourceforge_mirror _F_sourceforge_dirname } From vmiklos at frugalware.org Thu Jun 1 18:13:02 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 18:13:04 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: dvd support Message-ID: <20060601161302.BB8FBFB4017@genesis.frugalware.org> [mkiso: dvd support VMiklos **20060601161004] { hunk ./mkiso/mkiso.c 16 -// for 650Mb = 1024*1024*650 = 681574400 bytes with about 11Mb to spare -#define CD_SIZE 670000000 +// for 650Mb = 1024*650 = 681574400 bytes with about 11Mb to spare +//#define CD_SIZE 665600 +#define CD_SIZE 4590208 hunk ./mkiso/mkiso.c 22 -#define MEDIA "cd" -#define VOLUME 1 +#define MEDIA "dvd" +#define VOLUME 2 hunk ./mkiso/mkiso.c 163 - long int size = (long int)alpm_pkg_getinfo(pkg, PM_PKG_SIZE); + long int size = (long int)alpm_pkg_getinfo(pkg, PM_PKG_SIZE)/1024; + char *ptr; hunk ./mkiso/mkiso.c 166 - if (total+size > CD_SIZE - 20971520) + if (total+size > CD_SIZE - 20480) hunk ./mkiso/mkiso.c 173 - iso_add(fp, "frugalware-%s/%s-%s-%s%s", + { + if(detect_priority(pkg)>50) + ptr = strdup("frugalware-%s/%s-%s-%s%s"); + else + ptr = strdup("extra/frugalware-%s/%s-%s-%s%s"); + iso_add(fp, ptr, hunk ./mkiso/mkiso.c 184 + } hunk ./mkiso/mkiso.c 212 +void cb_log(unsigned short level, char *msg) +{ + printf("%s\n", msg); +} + hunk ./mkiso/mkiso.c 219 - PM_DB *db_local, *db_fwcurr; + PM_DB *db_local, *db_fwcurr, *db_fwextra; hunk ./mkiso/mkiso.c 224 + alpm_set_option(PM_OPT_LOGCB, (long)cb_log); + alpm_set_option(PM_OPT_LOGMASK, (long)-1); hunk ./mkiso/mkiso.c 230 + if((db_fwextra = alpm_db_register("extra-current"))==NULL) + fprintf(stderr, "could not register 'extra-current' database (%s)\n", alpm_strerror(pm_errno)); hunk ./mkiso/mkiso.c 236 + { hunk ./mkiso/mkiso.c 251 + for(i=alpm_db_getpkgcache(db_fwextra); i; i=alpm_list_next(i)) + { + PM_PKG *pkg=alpm_list_getdata(i); + isopkg_t *isopkg; + + if((isopkg = (isopkg_t *)malloc(sizeof(isopkg_t)))==NULL) + { + fprintf(stderr, "out of memory!\n"); + return(1); + } + isopkg->pkg = pkg; + isopkg->priority = detect_priority(pkg); + isopkgs = g_list_append(isopkgs, isopkg); + } + } } From vmiklos at frugalware.org Thu Jun 1 18:13:03 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 18:13:07 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: trans prepare error is a fatal one Message-ID: <20060601161303.4893BFB4017@genesis.frugalware.org> [mkiso: trans prepare error is a fatal one VMiklos **20060601103340] { hunk ./mkiso/mkiso.c 240 + { hunk ./mkiso/mkiso.c 242 + alpm_trans_release(); + return(1); + } } From vmiklos at frugalware.org Thu Jun 1 18:13:03 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 18:13:07 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: more verbose error message if prepare fails Message-ID: <20060601161303.AE2B9FB401B@genesis.frugalware.org> [mkiso: more verbose error message if prepare fails VMiklos **20060601104410] { hunk ./mkiso/mkiso.c 242 + for(i = alpm_list_first(junk); i; i = alpm_list_next(i)) + { + PM_DEPMISS *miss = alpm_list_getdata(i); + + printf(":: %s: %s %s", (char*)alpm_dep_getinfo(miss, PM_DEP_TARGET), + (int)alpm_dep_getinfo(miss, PM_DEP_TYPE) == PM_DEP_TYPE_DEPEND ? "requires" : "is required by", + (char*)alpm_dep_getinfo(miss, PM_DEP_NAME)); + switch((int)alpm_dep_getinfo(miss, PM_DEP_MOD)) + { + case PM_DEP_MOD_EQ: printf("=%s\n", (char*)alpm_dep_getinfo(miss, PM_DEP_VERSION)); break; + case PM_DEP_MOD_GE: printf(">=%s\n", (char*)alpm_dep_getinfo(miss, PM_DEP_VERSION)); break; + case PM_DEP_MOD_LE: printf("<=%s\n", (char*)alpm_dep_getinfo(miss, PM_DEP_VERSION)); break; + default: printf("\n"); break; + } + } + alpm_list_free(junk); } From crazy at frugalware.org Thu Jun 1 18:36:50 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 18:36:52 2006 Subject: [Frugalware-darcs] frugalware-current: kdesdk-3.5.3-2-i686 Message-ID: <20060601163650.0E99CFB4017@genesis.frugalware.org> [kdesdk-3.5.3-2-i686 crazy **20060601163341 * relbump * subversion support back only compiles with >=1.3.2 ... ] { hunk ./extra/source/kde/kdesdk/FrugalBuild 1 -# Last Modified: Thu, 01 Jun 2006 04:26:26 +0200 -# Compiling Time: 5.78 SBU +# Last Modified: Thu, 01 Jun 2006 18:28:29 +0200 +# Compiling Time: 6.36 SBU hunk ./extra/source/kde/kdesdk/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./extra/source/kde/kdesdk/FrugalBuild 11 -depends=('kdebase>=3.5.3' 'db') +depends=('kdebase>=3.5.2' 'db' 'subversion>=1.3.2') hunk ./extra/source/kde/kdesdk/FrugalBuild 17 -build() -{ - Fcd - #make -f Makefile.cvs || return 1 - Fbuild CXXFLAGS="$CXXFLAGS -Wno-deprecated" \ - --disable-dependency-tracking \ - --disable-debug \ - --without-debug \ - --disable-warnings \ - --with-gnu-ld \ - --enable-gcc-hidden-visibility \ - DO_NOT_COMPILE="doc" \ - --with-berkeley-db - #--with-apr-config=/usr/bin/apr-1-config \ - #--with-apu-config=/usr/bin/apu-1-config -} +Fconfopts="$Fconfopts \ + --enable-new-ldflags \ + --with-subversion \ + --with-berkeley-db \ + --with-apr-config=/usr/bin/apr-1-config \ + --with-apu-config=/usr/bin/apu-1-config" + } From vmiklos at frugalware.org Thu Jun 1 18:49:08 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 18:49:11 2006 Subject: [Frugalware-darcs] frugalware-current: openoffice.org-2.0.2.999.4-1-x86_64 Message-ID: <20060601164908.DCFCBFB4019@genesis.frugalware.org> [openoffice.org-2.0.2.999.4-1-x86_64 VMiklos **20060601164659 added a few comments fixed SMP build (again) ] { hunk ./source/xapps/openoffice.org/FrugalBuild 8 +# this is the default, -stable hunk ./source/xapps/openoffice.org/FrugalBuild 10 +# uncomment this to get a -devel build +#options=('scriptlet' 'devel') hunk ./source/xapps/openoffice.org/FrugalBuild 191 + + # SMP build + if [ ! -z "$MAKEFLAGS" ]; then + Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}" + unset MAKEFLAGS + fi + } From crazy at frugalware.org Thu Jun 1 19:00:54 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 19:00:56 2006 Subject: [Frugalware-darcs] frugalware-current: kdesdk-docs-3.5.3-1-i686 Message-ID: <20060601170054.DE956FB4017@genesis.frugalware.org> [kdesdk-docs-3.5.3-1-i686 crazy **20060601165456 * Version bump ] { hunk ./extra/source/kde/kdesdk-docs/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 08:52:45 +0200 +# Last Modified: Thu, 01 Jun 2006 18:48:43 +0200 hunk ./extra/source/kde/kdesdk-docs/FrugalBuild 7 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdesdk-docs/FrugalBuild 12 -rodepends=('kdesdk>=3.5.2') -makedepends=('kdelibs>=3.5.2') +rodepends=('kdesdk>=3.5.3') +makedepends=('kdelibs>=3.5.3') hunk ./extra/source/kde/kdesdk-docs/FrugalBuild 16 -sha1sums=('463975860e7881f2d67c20ec2f5f2e34858e5966') +sha1sums=('6d463bff975605bef1ab89fe78ce6d9a8284fb64') hunk ./extra/source/kde/kdesdk-docs/FrugalBuild 28 -# vim: ft=sh - -# optimalization OK - } From crazy at frugalware.org Thu Jun 1 20:59:27 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 20:59:29 2006 Subject: [Frugalware-darcs] frugalware-current: dbus-0.61-5-i686 Message-ID: <20060601185927.DC635FB4017@genesis.frugalware.org> [dbus-0.61-5-i686 crazy **20060601185702 * relbump * don't start dbus-launch for fst and root * back to expat code for now xml is broken ] { hunk ./source/apps/dbus/FrugalBuild 1 -# Last modified: Fri, 21 Apr 2006 19:23:43 +0200 +# Last modified: Thu, 01 Jun 2006 20:54:14 +0200 hunk ./source/apps/dbus/FrugalBuild 8 -pkgrel=4 +pkgrel=5 hunk ./source/apps/dbus/FrugalBuild 22 - '69b8c2e41ea73cba39d9e1d48db3645a01d3e242') + '050da3b1f1a26edd5f717a7c7f6424f8c87399b9') hunk ./source/apps/dbus/FrugalBuild 42 - --with-xml=libxml --enable-dnotify --with-gnu-ld \ + --with-xml=expat --enable-dnotify --with-gnu-ld \ hunk ./source/apps/dbus/dbus.sh 2 -## TODO: kill root + hunk ./source/apps/dbus/dbus.sh 4 -if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - eval `$dbuslaunch --auto-syntax --exit-with-session` +if [ "`whoami`" != "fst" -a "`whoami`" != "root" ]; then + if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + eval `$dbuslaunch --auto-syntax --exit-with-session` + fi hunk ./source/apps/dbus/dbus.sh 10 - } From vmiklos at frugalware.org Thu Jun 1 21:27:57 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 21:27:59 2006 Subject: [Frugalware-darcs] setup: install: call installpkgs_forreal() only in case there are packages to install from the current volume Message-ID: <20060601192757.83A33FB4017@genesis.frugalware.org> [install: call installpkgs_forreal() only in case there are packages to install from the current volume VMiklos **20060601161056] { hunk ./src/plugins/install.c 140 - installpkgs_forreal(list); + if(g_list_length(list)) + installpkgs_forreal(list); } From vmiklos at frugalware.org Thu Jun 1 21:27:57 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 21:28:00 2006 Subject: [Frugalware-darcs] setup: bugfix: empty pkglist is "", not NULL Message-ID: <20060601192757.C4D3DFB401B@genesis.frugalware.org> [bugfix: empty pkglist is "", not NULL VMiklos **20060601192455] { hunk ./src/plugins/install.c 53 - if(!g_list_length(pkgs)) - // nothing to do - return(0); hunk ./src/plugins/install.c 54 - if(ptr!=NULL) + if(ptr!=NULL && strlen(ptr)) } From vmiklos at frugalware.org Thu Jun 1 21:27:58 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 21:28:01 2006 Subject: [Frugalware-darcs] setup: install: move the package counter check to installpkgs_forreal() Message-ID: <20060601192758.97F83FB401B@genesis.frugalware.org> [install: move the package counter check to installpkgs_forreal() VMiklos **20060601170703] { hunk ./src/plugins/install.c 53 + if(!g_list_length(pkgs)) + // nothing to do + return(0); hunk ./src/plugins/install.c 143 - if(g_list_length(list)) - installpkgs_forreal(list); + installpkgs_forreal(list); } From crazy at frugalware.org Thu Jun 1 22:05:38 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 22:05:40 2006 Subject: [Frugalware-darcs] frugalware-current: kdewebdev-3.5.3-1-i686 Message-ID: <20060601200538.A1B7AFB4019@genesis.frugalware.org> [kdewebdev-3.5.3-1-i686 crazy **20060601200314 * Version bump ] { hunk ./extra/source/kde/kdewebdev/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 07:43:41 +0200 +# Last Modified: Thu, 01 Jun 2006 21:30:52 +0200 hunk ./extra/source/kde/kdewebdev/FrugalBuild 6 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdewebdev/FrugalBuild 11 -depends=('kdesdk>=3.5.2' 'libxslt' 'libxml2' 'tidy') +depends=('kdesdk>=3.5.3' 'libxslt' 'libxml2' 'tidy') hunk ./extra/source/kde/kdewebdev/FrugalBuild 13 -Finclude kde hunk ./extra/source/kde/kdewebdev/FrugalBuild 14 -sha1sums=('29d84a66b3d5be52e729c962c2994199db6f63e7') +Finclude kde +sha1sums=('04807ffa7bb301cc866941c421d9fb7da6584672') hunk ./extra/source/kde/kdewebdev/FrugalBuild 17 -# optimalization OK +# optimization OK } From crazy at frugalware.org Thu Jun 1 22:21:19 2006 From: crazy at frugalware.org (crazy) Date: Thu Jun 1 22:21:21 2006 Subject: [Frugalware-darcs] frugalware-current: scim-chewing-0.3.1-1-i686 Message-ID: <20060601202119.EE5A6FB4019@genesis.frugalware.org> [scim-chewing-0.3.1-1-i686 crazy **20060601201911 * Version bump ] { hunk ./source/xapps/scim-chewing/FrugalBuild 1 -# Last Modified: Sun, 28 May 2006 17:17:13 +0200 +# Last Modified: Thu, 01 Jun 2006 22:18:38 +0200 hunk ./source/xapps/scim-chewing/FrugalBuild 6 -pkgver=0.3.0 +pkgver=0.3.1 hunk ./source/xapps/scim-chewing/FrugalBuild 10 -depends=('scim>=1.4.4' "libchewing=$pkgver") +depends=('scim>=1.4.4' "libchewing>=0.3.0" 'perl-xml') hunk ./source/xapps/scim-chewing/FrugalBuild 13 +options=('scriptlet') hunk ./source/xapps/scim-chewing/FrugalBuild 16 -sha1sums=('4bdadc1340d8fec95ff7913389f65318ad5e5eae') +sha1sums=('8114f297322fe94755c0349d287ee550ee6a96a2') } From vmiklos at frugalware.org Thu Jun 1 22:34:13 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 22:34:15 2006 Subject: [Frugalware-darcs] setup: util: typo fix in g_list_display() Message-ID: <20060601203413.66E5FFB4017@genesis.frugalware.org> [util: typo fix in g_list_display() VMiklos **20060601201603] { hunk ./src/util.c 363 - for (i=1; i [libalpm: added debug messages in sortbydeps() VMiklos **20060601203745] { hunk ./lib/libalpm/deps.c 113 + _alpm_log(PM_LOG_DEBUG, _("started sorting dependencies")); hunk ./lib/libalpm/deps.c 161 + _alpm_log(PM_LOG_DEBUG, _("sorting dependencies finished")); } From vmiklos at frugalware.org Thu Jun 1 22:42:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 22:42:36 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: removed some debug messages, we got them from libalpm already Message-ID: <20060601204235.00098FB4019@genesis.frugalware.org> [mkiso: removed some debug messages, we got them from libalpm already VMiklos **20060601203946] { hunk ./mkiso/mkiso.c 270 - printf("sorting dependencies..."); - fflush(stdout); hunk ./mkiso/mkiso.c 292 - printf(" done.\n"); } From vmiklos at frugalware.org Thu Jun 1 23:31:25 2006 From: vmiklos at frugalware.org (VMiklos) Date: Thu Jun 1 23:31:28 2006 Subject: [Frugalware-darcs] frugalware-current: firefox-1.5.0.4-1-i686 Message-ID: <20060601213125.54856FB4017@genesis.frugalware.org> [firefox-1.5.0.4-1-i686 VMiklos **20060601212648 version bump ] { hunk ./source/xapps/firefox/FrugalBuild 1 -# Last modified: Sun, 21 May 2006 16:32:03 +0200 +# Last modified: Thu, 01 Jun 2006 21:05:59 +0200 hunk ./source/xapps/firefox/FrugalBuild 7 -pkgver=1.5.0.3 -pkgrel=2 +pkgver=1.5.0.4 +pkgrel=1 hunk ./source/xapps/firefox/FrugalBuild 82 -sha1sums=('f3305ea944b0e77e0279234190331ffcb0ae7eea' \ +sha1sums=('3659272e3de17cd263fbe5e328635ed7a18f70c5' \ } [firefox-1.5.0.4-1-i686 VMiklos **20060601212947 sha1sums() -> signatures() ] { hunk ./source/xapps/firefox/FrugalBuild 35 +signatures=("${source[0]}.asc" '' '' '' '' '' '' '' '' '' '') hunk ./source/xapps/firefox/FrugalBuild 83 -sha1sums=('3659272e3de17cd263fbe5e328635ed7a18f70c5' \ - '4bc71f7f3d400bb7d15e53020f6a09e4b8643d73' \ - '6c14c3d1a557d6ff844fbd27e28a0a043bd5c74f' \ - 'd6bc3a6a099f37dc93d6ee9382b3a0ee9fabf9b6' \ - '6cb2982f2113638eeac00d47abac55ae09ccb780' \ - 'd135d57c4033e89e5fd93994efa2f12338ac1ae6' \ - '7ad741a14a454e2f4ffa4255f18ccc431ad3c87d' \ - '431c40d0347c4bc654aaf6c1946b6e2e00b8e257' \ - '03784dc969b14b187d078fab0b5b6305bc68c4cb' \ - 'a797c04d67d343d068c108b804883a7815f3197b' \ - '5b0724fce7e15b0ba076842884dc90683318cd9a') - } From vmiklos at frugalware.org Fri Jun 2 00:24:17 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 00:24:19 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: remove the dbpath after the generation Message-ID: <20060601222417.AD74EFB4017@genesis.frugalware.org> [mkiso: remove the dbpath after the generation VMiklos **20060601222102] { hunk ./mkiso/mkiso.c 5 +#include +#include hunk ./mkiso/mkiso.c 243 +/* does the same thing as 'rm -rf' */ +int rmrf(char *path) +{ + int errflag = 0; + struct dirent *dp; + DIR *dirp; + char name[PATH_MAX]; + + if(!unlink(path)) + return(0); + else + { + if(errno == ENOENT) + return(0); + else if(errno == EPERM) + { + /* fallthrough */ + } + else if(errno == EISDIR) + { + /* fallthrough */ + } + else if(errno == ENOTDIR) + return(1); + else + /* not a directory */ + return(1); + + if((dirp = opendir(path)) == (DIR *)-1) + return(1); + for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) + if(dp->d_ino) + { + sprintf(name, "%s/%s", path, dp->d_name); + if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) + errflag += rmrf(name); + } + closedir(dirp); + if(rmdir(path)) + errflag++; + return(errflag); + } + return(0); +} + hunk ./mkiso/mkiso.c 367 + alpm_release(); + rmrf(tmproot); } From vmiklos at frugalware.org Fri Jun 2 00:24:18 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 00:24:21 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: no longer hardwire the dbpath Message-ID: <20060601222418.29F6EFB4017@genesis.frugalware.org> [mkiso: no longer hardwire the dbpath VMiklos **20060601221649 it's now a random /tmp/mkiso_foo, not my /home/vmiklos/darcs/pacman-tools/mkiso/t also automatically update it TODO: remove it after the generation ] { hunk ./mkiso/Makefile 2 -CFLAGS += -Wall +CFLAGS ?= -g -Wall -Werror hunk ./mkiso/TODO 1 -mkdir t && sudo pacman -Sy -r t needed -/home/vmiklos/darcs/pacman-tools/mkiso/t and frugalware-current hardwired +frugalware-current hardwired hunk ./mkiso/mkiso.c 26 +#define FST_ROOT "/home/ftp/pub/frugalware/frugalware-current" + hunk ./mkiso/mkiso.c 191 - chdir("/home/ftp/pub/frugalware/frugalware-current"); + chdir(FST_ROOT); hunk ./mkiso/mkiso.c 219 +PM_DB *db_register(char *treename) +{ + PM_DB *db; + char *ptr; + + if(!(db = alpm_db_register(treename))) + { + fprintf(stderr, "could not register '%s' database (%s)\n", treename, alpm_strerror(pm_errno)); + return(NULL); + } + if(!strcmp(treename, "frugalware-current")) + ptr = g_strdup_printf("%s/frugalware-%s/%s.fdb", FST_ROOT, ARCH, treename); + else + ptr = g_strdup_printf("%s/extra/frugalware-%s/%s.fdb", FST_ROOT, ARCH, treename); + if(alpm_db_update(db, ptr) == -1) + { + fprintf(stderr, "failed to update %s (%s)\n", treename, alpm_strerror(pm_errno)); + return(NULL); + } + return(db); +} + hunk ./mkiso/mkiso.c 245 + char tmproot[] = "/tmp/mkiso_XXXXXX"; + + mkdtemp(tmproot); hunk ./mkiso/mkiso.c 249 - if(alpm_initialize("/home/vmiklos/darcs/pacman-tools/mkiso/t") == -1) + if(alpm_initialize(tmproot) == -1) hunk ./mkiso/mkiso.c 255 - if((db_fwcurr = alpm_db_register("frugalware-current"))==NULL) - fprintf(stderr, "could not register 'frugalware-current' database (%s)\n", alpm_strerror(pm_errno)); - if((db_fwextra = alpm_db_register("extra-current"))==NULL) - fprintf(stderr, "could not register 'extra-current' database (%s)\n", alpm_strerror(pm_errno)); + db_fwcurr = db_register("frugalware-current"); + db_fwextra = db_register("extra-current"); } From vmiklos at frugalware.org Fri Jun 2 00:44:17 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 00:44:20 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: new function: detect_kernel() Message-ID: <20060601224417.2187EFB4019@genesis.frugalware.org> [mkiso: new function: detect_kernel() VMiklos **20060601223640] { hunk ./mkiso/mkiso.c 26 -#define KERNEL "2.6.16-fw5" hunk ./mkiso/mkiso.c 127 +char *detect_kernel() +{ + DIR *dir; + struct dirent *ent; + char *ptr = g_strdup_printf("%s/boot", FST_ROOT); + + dir = opendir(ptr); + free(ptr); + if (!dir) + return(NULL); + while ((ent = readdir(dir))) + { + if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) + continue; + if(strstr(ent->d_name, "vmlinuz-") && strstr(ent->d_name, ARCH)) + { + closedir(dir); + return(strdup(ent->d_name+strlen("vmlinuz-"))); + } + } + closedir(dir); + return(NULL); +} + hunk ./mkiso/mkiso.c 158 - char *flist; - char *cmdline; + char *flist, *cmdline, *ptr; hunk ./mkiso/mkiso.c 172 - iso_add(fp, "boot/vmlinuz-%s-%s", KERNEL, ARCH); + ptr = detect_kernel(); + iso_add(fp, "boot/vmlinuz-%s-%s", ptr, ARCH); + free(ptr); } From crazy at frugalware.org Fri Jun 2 01:08:31 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 01:08:33 2006 Subject: [Frugalware-darcs] frugalware-current: skim-1.4.4-2-i686 Message-ID: <20060601230831.8EAE4FB401A@genesis.frugalware.org> [skim-1.4.4-2-i686 crazy **20060601230506 * s/autostart true/autostart false/ -- don't start this by default. -- README.Frugalware with chinese text is needed have to poke Eric about. ] { hunk ./source/kde/skim/FrugalBuild 1 -# Last Modified: Mon, 29 May 2006 00:10:45 +0200 +# Last Modified: Fri, 02 Jun 2006 01:01:35 +0200 hunk ./source/kde/skim/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/kde/skim/FrugalBuild 29 + Fsed "Autostart:true" "Autostart:false" $Fdestdir/usr/share/autostart/*.desktop } From crazy at frugalware.org Fri Jun 2 02:16:18 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 02:16:19 2006 Subject: [Frugalware-darcs] frugalware-current: anthy-7802-1-i686 Message-ID: <20060602001618.3058DFB4017@genesis.frugalware.org> [anthy-7802-1-i686 crazy **20060602001538 * Version bump ] { hunk ./source/lib/anthy/FrugalBuild 1 -# Last Modified: Mon, 29 May 2006 04:40:00 +0200 +# Last Modified: Fri, 02 Jun 2006 02:15:10 +0200 hunk ./source/lib/anthy/FrugalBuild 6 -pkgver=7716 +pkgver=7802 hunk ./source/lib/anthy/FrugalBuild 16 -source=(http://osdn.dl.sourceforge.jp/$pkgname/20192/$pkgname-$pkgver.tar.gz) -sha1sums=('ab4972909312cefcfa78a53181060254e98cb240') +source=(http://osdn.dl.sourceforge.jp/$pkgname/20385/$pkgname-$pkgver.tar.gz) +sha1sums=('1f3218575ff46eda86d2618adcd2b2c7c2c7bf39') } From vmiklos at frugalware.org Fri Jun 2 02:22:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 02:22:25 2006 Subject: [Frugalware-darcs] frugalware-current: galeon-2.0.1-4-i686 Message-ID: <20060602002223.7BD91FB4017@genesis.frugalware.org> [galeon-2.0.1-4-i686 VMiklos **20060602002135 compiled against new firefox / bump pkgrel ] { hunk ./extra/source/gnome/galeon/FrugalBuild 1 -# Last Modified: Fri, 05 May 2006 11:27:44 +0530 +# Last Modified: Thu, 01 Jun 2006 23:48:23 +0200 hunk ./extra/source/gnome/galeon/FrugalBuild 8 -pkgrel=3 +pkgrel=4 } From vmiklos at frugalware.org Fri Jun 2 02:58:43 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 02:58:49 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: get rid of all unnecessary #defines, use the values from the config Message-ID: <20060602005843.53BFFFB4017@genesis.frugalware.org> [mkiso: get rid of all unnecessary #defines, use the values from the config VMiklos **20060602004544] { hunk ./mkiso/TODO 1 -frugalware-current hardwired +extra repo on cds - need to test hunk ./mkiso/mkiso.c 39 -// FIXME: cmdline switch, config file or something else for these -#define ARCH "i686" -#define MEDIA "dvd" -#define VOLUME 2 - hunk ./mkiso/mkiso.c 257 -char *detect_kernel() +char *detect_kernel(char *arch) hunk ./mkiso/mkiso.c 271 - if(strstr(ent->d_name, "vmlinuz-") && strstr(ent->d_name, ARCH)) + if(strstr(ent->d_name, "vmlinuz-") && strstr(ent->d_name, arch)) hunk ./mkiso/mkiso.c 281 -int mkiso() +int mkiso(volume_t *volume) hunk ./mkiso/mkiso.c 284 - int total=0, volume=1; - char *fname=get_filename(fst_ver, ARCH, MEDIA, VOLUME); - char *label=get_label(fst_ver, ARCH, MEDIA, VOLUME); + int total=0, myvolume=1; + char *fname=get_filename(fst_ver, volume->arch, volume->media, volume->serial); + char *label=get_label(fst_ver, volume->arch, volume->media, volume->serial); hunk ./mkiso/mkiso.c 301 - ptr = detect_kernel(); - iso_add(fp, "boot/vmlinuz-%s-%s", ptr, ARCH); + ptr = detect_kernel(volume->arch); + iso_add(fp, "boot/vmlinuz-%s", ptr); hunk ./mkiso/mkiso.c 304 - iso_add(fp, "boot/initrd-%s.img.gz", ARCH); + iso_add(fp, "boot/initrd-%s.img.gz", volume->arch); hunk ./mkiso/mkiso.c 307 - if(VOLUME==1) + // first volume of !net medias + if(volume->serial==1) hunk ./mkiso/mkiso.c 310 - if(!strcmp(MEDIA, "cd") || !strcmp(MEDIA, "dvd")) hunk ./mkiso/mkiso.c 311 - if(!strcmp(MEDIA, "dvd")) hunk ./mkiso/mkiso.c 322 - if (total+size > CD_SIZE - 20480) + if (total+size > volume->size - 20480) hunk ./mkiso/mkiso.c 325 - volume++; + myvolume++; hunk ./mkiso/mkiso.c 328 - if(volume==VOLUME) + if(myvolume==volume->serial) hunk ./mkiso/mkiso.c 330 + // XXX: a separate function could determine the right + // path without any hardcoded number.. hunk ./mkiso/mkiso.c 337 - ARCH, + volume->arch, hunk ./mkiso/mkiso.c 374 -PM_DB *db_register(char *treename) +PM_DB *db_register(volume_t *volume, char *treename) hunk ./mkiso/mkiso.c 385 - ptr = g_strdup_printf("%s/frugalware-%s/%s.fdb", fst_root, ARCH, treename); + ptr = g_strdup_printf("%s/frugalware-%s/%s.fdb", fst_root, volume->arch, treename); hunk ./mkiso/mkiso.c 387 - ptr = g_strdup_printf("%s/extra/frugalware-%s/%s.fdb", fst_root, ARCH, treename); + ptr = g_strdup_printf("%s/extra/frugalware-%s/%s.fdb", fst_root, volume->arch, treename); hunk ./mkiso/mkiso.c 441 -int prepare(PM_DB *db_fwcurr, PM_DB *db_fwextra) +int prepare(volume_t *volume, char *tmproot) hunk ./mkiso/mkiso.c 444 + PM_DB *db_local, *db_fwcurr, *db_fwextra; + + if(alpm_initialize(tmproot) == -1) + fprintf(stderr, "failed to initilize alpm library (%s)\n", alpm_strerror(pm_errno)); + alpm_set_option(PM_OPT_LOGCB, (long)cb_log); + alpm_set_option(PM_OPT_LOGMASK, (long)-1); + if((db_local = alpm_db_register("local"))==NULL) + fprintf(stderr, "could not register 'local' database (%s)\n", alpm_strerror(pm_errno)); + db_fwcurr = db_register(volume, "frugalware-current"); + db_fwextra = db_register(volume, "extra-current"); hunk ./mkiso/mkiso.c 458 - if(strcmp(MEDIA, "net")) + if(strcmp(volume->media, "net")) hunk ./mkiso/mkiso.c 516 - mkiso(); + mkiso(volume); hunk ./mkiso/mkiso.c 518 + alpm_release(); hunk ./mkiso/mkiso.c 524 - PM_DB *db_local, *db_fwcurr, *db_fwextra; hunk ./mkiso/mkiso.c 526 + int i; hunk ./mkiso/mkiso.c 538 - if(alpm_initialize(tmproot) == -1) - fprintf(stderr, "failed to initilize alpm library (%s)\n", alpm_strerror(pm_errno)); - alpm_set_option(PM_OPT_LOGCB, (long)cb_log); - alpm_set_option(PM_OPT_LOGMASK, (long)-1); - if((db_local = alpm_db_register("local"))==NULL) - fprintf(stderr, "could not register 'local' database (%s)\n", alpm_strerror(pm_errno)); - db_fwcurr = db_register("frugalware-current"); - db_fwextra = db_register("extra-current"); - - /// + for(i=0;i [mkiso: basic xml config file handling VMiklos **20060602001646 still need to get rid of all the #defines ] { hunk ./mkiso/Makefile 5 +CFLAGS += $(shell pkg-config --cflags libxml-2.0) +LDFLAGS += $(shell pkg-config --libs libxml-2.0) hunk ./mkiso/mkiso.c 7 +#include +#include hunk ./mkiso/mkiso.c 11 +#include +#include + +typedef struct __volume_t +{ + char *arch; + char *media; + int serial; + int size; +} volume_t; hunk ./mkiso/mkiso.c 29 +GList *volumes=NULL; + +char *fst_root=NULL; +char *fst_ver=NULL; hunk ./mkiso/mkiso.c 35 -//#define CD_SIZE 665600 -#define CD_SIZE 4590208 +// FIXME: correct this after the kernel&initrd FIXME is done +#define CD_SIZE 665600 +#define DVD_SIZE 4590208 hunk ./mkiso/mkiso.c 44 -#define FST_ROOT "/home/ftp/pub/frugalware/frugalware-current" +char *getarch() +{ + struct utsname name; + + uname (&name); + return(strdup(name.machine)); +} + +char *get_timestamp() +{ + time_t t; + struct tm *tm; + char buf[9]; + + t = time(NULL); + tm = localtime(&t); + + sprintf(buf, "20%02d%02d%02d", tm->tm_year-100, tm->tm_mon+1, tm->tm_mday); + return(strdup(buf)); +} + +int parseVolume(xmlDoc *doc, xmlNode *cur) +{ + xmlChar *key; + cur = cur->xmlChildrenNode; + volume_t *volume; + + if((volume = (volume_t *)malloc(sizeof(volume_t)))==NULL) + { + fprintf(stderr, "out of memory!\n"); + return(1); + } + memset(volume, 0, sizeof(volume_t)); + while (cur != NULL) + { + key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); + if ((!xmlStrcmp(cur->name, (const xmlChar *)"arch"))) + volume->arch = strdup((char*)key); + if ((!xmlStrcmp(cur->name, (const xmlChar *)"media"))) + volume->media = strdup((char*)key); + if ((!xmlStrcmp(cur->name, (const xmlChar *)"serial"))) + volume->serial = atoi((char*)key); + if ((!xmlStrcmp(cur->name, (const xmlChar *)"size"))) + volume->size = atoi((char*)key); + xmlFree(key); + cur = cur->next; + } + if(!volume->arch) + { + volume->arch = getarch(); + } + if(!volume->media) + { + fprintf(stderr, "media directive for a volume is required!\n"); + return(1); + } + if(!volume->serial && strcmp(volume->media, "net")) + { + fprintf(stderr, "media serial for a cd/dvd is required!\n"); + return(1); + } + if(!volume->size) + { + if(strcmp(volume->media, "cd")) + volume->size=CD_SIZE; + else if(strcmp(volume->media, "dvd")) + volume->size=DVD_SIZE; + } + volumes = g_list_append(volumes, volume); + return(0); +} + +int parseVolumes(char *docname) +{ + xmlDocPtr doc; + xmlNodePtr cur; + xmlChar *key; + + doc = xmlParseFile(docname); + + if(doc == NULL) + { + fprintf(stderr, "document not parsed successfully\n"); + return(1); + } + + cur = xmlDocGetRootElement(doc); + + if(cur == NULL) + { + fprintf(stderr, "empty document\n"); + xmlFreeDoc(doc); + return(1); + } + + if(xmlStrcmp(cur->name, (const xmlChar *)"volumes")) + { + fprintf(stderr, "document of the wrong type, root node != volumes"); + xmlFreeDoc(doc); + return(1); + } + + cur = cur->xmlChildrenNode; + while(cur != NULL) + { + key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); + if((!xmlStrcmp(cur->name, (const xmlChar *)"fst_root"))) + fst_root = strdup((char*)key); + else if((!xmlStrcmp(cur->name, (const xmlChar *)"version"))) + fst_ver = strdup((char*)key); + else if((!xmlStrcmp(cur->name, (const xmlChar *)"volume"))) + if(parseVolume(doc, cur)) + return(1); + xmlFree(key); + cur = cur->next; + } + if(!fst_root) + { + fprintf(stderr, "missing fst_root directive\n"); + return(1); + } + if(!fst_ver) + fst_ver = get_timestamp(); + if(!volumes) + { + fprintf(stderr, "at least one volume is required\n"); + return(1); + } + + xmlFreeDoc(doc); + return(0); +} hunk ./mkiso/mkiso.c 230 -char *get_timestamp() -{ - time_t t; - struct tm *tm; - char buf[9]; - - t = time(NULL); - tm = localtime(&t); - - sprintf(buf, "20%02d%02d%02d", tm->tm_year-100, tm->tm_mon+1, tm->tm_mday); - return(strdup(buf)); -} - hunk ./mkiso/mkiso.c 266 - char *ptr = g_strdup_printf("%s/boot", FST_ROOT); + char *ptr = g_strdup_printf("%s/boot", fst_root); hunk ./mkiso/mkiso.c 290 - char *version=get_timestamp(); - char *fname=get_filename(version, ARCH, MEDIA, VOLUME); - char *label=get_label(version, ARCH, MEDIA, VOLUME); + char *fname=get_filename(fst_ver, ARCH, MEDIA, VOLUME); + char *label=get_label(fst_ver, ARCH, MEDIA, VOLUME); hunk ./mkiso/mkiso.c 351 - chdir(FST_ROOT); + chdir(fst_root); hunk ./mkiso/mkiso.c 364 - free(version); hunk ./mkiso/mkiso.c 389 - ptr = g_strdup_printf("%s/frugalware-%s/%s.fdb", FST_ROOT, ARCH, treename); + ptr = g_strdup_printf("%s/frugalware-%s/%s.fdb", fst_root, ARCH, treename); hunk ./mkiso/mkiso.c 391 - ptr = g_strdup_printf("%s/extra/frugalware-%s/%s.fdb", FST_ROOT, ARCH, treename); + ptr = g_strdup_printf("%s/extra/frugalware-%s/%s.fdb", fst_root, ARCH, treename); hunk ./mkiso/mkiso.c 445 -int main() +int main(int argc, char **argv) hunk ./mkiso/mkiso.c 450 + char *xmlfile = strdup("volumes.xml"); + int j; hunk ./mkiso/mkiso.c 453 + if(argc >= 2) + { + free(xmlfile); + xmlfile = strdup(argv[1]); + } + + if(parseVolumes(xmlfile)) + return(1); + else + { + printf("xml parsolva, jol\nstat:\n"); + printf("fst_root: %s\n", fst_root); + printf("fst_ver: %s\n", fst_ver); + for(j=0;jarch, volume->media, volume->serial, volume->size); + } + return(0); + } hunk ./mkiso/mkiso.c 550 + free(fst_root); + free(fst_ver); } From vmiklos at frugalware.org Fri Jun 2 02:58:44 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 02:58:51 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: 2 typo fixes: s/strcmp()/!strcmp()/ Message-ID: <20060602005844.580F6FB401C@genesis.frugalware.org> [mkiso: 2 typo fixes: s/strcmp()/!strcmp()/ VMiklos **20060602005252] { hunk ./mkiso/mkiso.c 102 - if(strcmp(volume->media, "cd")) + if(!strcmp(volume->media, "cd")) hunk ./mkiso/mkiso.c 104 - else if(strcmp(volume->media, "dvd")) + else if(!strcmp(volume->media, "dvd")) } From vmiklos at frugalware.org Fri Jun 2 02:58:44 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 02:58:51 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: remove unnecessary xml debug block Message-ID: <20060602005844.E8D00FB4017@genesis.frugalware.org> [mkiso: remove unnecessary xml debug block VMiklos **20060602001759] { hunk ./mkiso/mkiso.c 461 - else - { - printf("xml parsolva, jol\nstat:\n"); - printf("fst_root: %s\n", fst_root); - printf("fst_ver: %s\n", fst_ver); - for(j=0;jarch, volume->media, volume->serial, volume->size); - } - return(0); - } } From vmiklos at frugalware.org Fri Jun 2 02:58:45 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 02:58:57 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: moved most of main() to a separete prepare() function Message-ID: <20060602005846.45C65FB401C@genesis.frugalware.org> [mkiso: moved most of main() to a separete prepare() function VMiklos **20060602002514] { hunk ./mkiso/mkiso.c 445 -int main(int argc, char **argv) +int prepare(PM_DB *db_fwcurr, PM_DB *db_fwextra) hunk ./mkiso/mkiso.c 447 - PM_DB *db_local, *db_fwcurr, *db_fwextra; hunk ./mkiso/mkiso.c 448 - char tmproot[] = "/tmp/mkiso_XXXXXX"; - char *xmlfile = strdup("volumes.xml"); - int j; hunk ./mkiso/mkiso.c 449 - if(argc >= 2) - { - free(xmlfile); - xmlfile = strdup(argv[1]); - } - - if(parseVolumes(xmlfile)) - return(1); - mkdtemp(tmproot); - - if(alpm_initialize(tmproot) == -1) - fprintf(stderr, "failed to initilize alpm library (%s)\n", alpm_strerror(pm_errno)); - alpm_set_option(PM_OPT_LOGCB, (long)cb_log); - alpm_set_option(PM_OPT_LOGMASK, (long)-1); - if((db_local = alpm_db_register("local"))==NULL) - fprintf(stderr, "could not register 'local' database (%s)\n", alpm_strerror(pm_errno)); - db_fwcurr = db_register("frugalware-current"); - db_fwextra = db_register("extra-current"); hunk ./mkiso/mkiso.c 512 + return(0); +} + +int main(int argc, char **argv) +{ + PM_DB *db_local, *db_fwcurr, *db_fwextra; + char tmproot[] = "/tmp/mkiso_XXXXXX"; + char *xmlfile = strdup("volumes.xml"); + + if(argc >= 2) + { + free(xmlfile); + xmlfile = strdup(argv[1]); + } + + if(parseVolumes(xmlfile)) + return(1); + mkdtemp(tmproot); + + if(alpm_initialize(tmproot) == -1) + fprintf(stderr, "failed to initilize alpm library (%s)\n", alpm_strerror(pm_errno)); + alpm_set_option(PM_OPT_LOGCB, (long)cb_log); + alpm_set_option(PM_OPT_LOGMASK, (long)-1); + if((db_local = alpm_db_register("local"))==NULL) + fprintf(stderr, "could not register 'local' database (%s)\n", alpm_strerror(pm_errno)); + db_fwcurr = db_register("frugalware-current"); + db_fwextra = db_register("extra-current"); + + /// + } From vmiklos at frugalware.org Fri Jun 2 02:58:48 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 02:58:57 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: indentation fixes Message-ID: <20060602005848.A3F2CFB4022@genesis.frugalware.org> [mkiso: indentation fixes VMiklos **20060602002050] { hunk ./mkiso/mkiso.c 476 - for(i=alpm_db_getpkgcache(db_fwcurr); i; i=alpm_list_next(i)) - { - PM_PKG *pkg=alpm_list_getdata(i); - isopkg_t *isopkg; - - if((isopkg = (isopkg_t *)malloc(sizeof(isopkg_t)))==NULL) + for(i=alpm_db_getpkgcache(db_fwcurr); i; i=alpm_list_next(i)) hunk ./mkiso/mkiso.c 478 - fprintf(stderr, "out of memory!\n"); - return(1); - } - isopkg->pkg = pkg; - isopkg->priority = detect_priority(pkg); - isopkgs = g_list_append(isopkgs, isopkg); - } - for(i=alpm_db_getpkgcache(db_fwextra); i; i=alpm_list_next(i)) - { - PM_PKG *pkg=alpm_list_getdata(i); - isopkg_t *isopkg; + PM_PKG *pkg=alpm_list_getdata(i); + isopkg_t *isopkg; hunk ./mkiso/mkiso.c 481 - if((isopkg = (isopkg_t *)malloc(sizeof(isopkg_t)))==NULL) + if((isopkg = (isopkg_t *)malloc(sizeof(isopkg_t)))==NULL) + { + fprintf(stderr, "out of memory!\n"); + return(1); + } + isopkg->pkg = pkg; + isopkg->priority = detect_priority(pkg); + isopkgs = g_list_append(isopkgs, isopkg); + } + for(i=alpm_db_getpkgcache(db_fwextra); i; i=alpm_list_next(i)) hunk ./mkiso/mkiso.c 492 - fprintf(stderr, "out of memory!\n"); - return(1); + PM_PKG *pkg=alpm_list_getdata(i); + isopkg_t *isopkg; + + if((isopkg = (isopkg_t *)malloc(sizeof(isopkg_t)))==NULL) + { + fprintf(stderr, "out of memory!\n"); + return(1); + } + isopkg->pkg = pkg; + isopkg->priority = detect_priority(pkg); + isopkgs = g_list_append(isopkgs, isopkg); hunk ./mkiso/mkiso.c 504 - isopkg->pkg = pkg; - isopkg->priority = detect_priority(pkg); - isopkgs = g_list_append(isopkgs, isopkg); - } } From vmiklos at frugalware.org Fri Jun 2 03:06:05 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 03:06:08 2006 Subject: [Frugalware-darcs] frugalware-current: epiphany-2.14.2.1-1-i686 Message-ID: <20060602010605.8045FFB4017@genesis.frugalware.org> [epiphany-2.14.2.1-1-i686 VMiklos **20060602010502 version bump ] { hunk ./extra/source/gnome/epiphany/FrugalBuild 1 -# Last Modified: Tue, 23 May 2006 02:01:10 +0200 +# Last Modified: Fri, 02 Jun 2006 02:59:09 +0200 hunk ./extra/source/gnome/epiphany/FrugalBuild 6 -pkgver=2.14.1.1 +pkgver=2.14.2.1 hunk ./extra/source/gnome/epiphany/FrugalBuild 11 - 'startup-notification' 'firefox=1.5.0.3' 'docbook-xsl') + 'startup-notification' 'firefox=1.5.0.4' 'docbook-xsl') hunk ./extra/source/gnome/epiphany/FrugalBuild 18 -sha1sums=('b1efc0d699a8e632db830c84c9c43141cdce7954') hunk ./extra/source/gnome/epiphany/FrugalBuild 33 +sha1sums=('c1b20979670755f2e82beedb475c42a54be8f993') } From crazy at frugalware.org Fri Jun 2 03:07:55 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 03:07:57 2006 Subject: [Frugalware-darcs] frugalware-current: libwpd-0.8.5-1-i686 Message-ID: <20060602010755.9E5F4FB4019@genesis.frugalware.org> [libwpd-0.8.5-1-i686 crazy **20060602010629 * Version bump ] { hunk ./source/xlib/libwpd/FrugalBuild 1 -# Last Modified: Mon, 06 Mar 2006 03:35:34 +0100 +# Last Modified: Fri, 02 Jun 2006 02:27:42 +0200 hunk ./source/xlib/libwpd/FrugalBuild 6 -pkgver=0.8.4 +pkgver=0.8.5 hunk ./source/xlib/libwpd/FrugalBuild 11 +_F_sourceforge_prefix='libwpd-' hunk ./source/xlib/libwpd/FrugalBuild 13 -up2date="lynx --dump http://libwpd.sourceforge.net/news.html| grep -m1 'libwpd '|sed 's/.*: //'|sed 's/.* \([0-9].[0-9].[0-9]\).*/\1/'" hunk ./source/xlib/libwpd/FrugalBuild 15 -sha1sums=('ac1e3b9ac145afa4211755bf8950832c3d59973c') +sha1sums=('8e5c395494297634729dc870917315a45aa58385') hunk ./source/xlib/libwpd/FrugalBuild 20 +# optimization OK + } From crazy at frugalware.org Fri Jun 2 03:14:57 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 03:15:01 2006 Subject: [Frugalware-darcs] frugalware-current: libmtp-0.0.6-1-i686 Message-ID: <20060602011457.E7696FB4017@genesis.frugalware.org> [libmtp-0.0.6-1-i686 crazy **20060602011415 * Version bump ] { hunk ./extra/source/lib/libmtp/FrugalBuild 1 -# Last Modified: Sat, 20 May 2006 17:18:57 +0200 +# Last Modified: Fri, 02 Jun 2006 03:13:19 +0200 hunk ./extra/source/lib/libmtp/FrugalBuild 6 -pkgver=0.0.5 +pkgver=0.0.6 hunk ./extra/source/lib/libmtp/FrugalBuild 14 -sha1sums=('39aa2e36a85a33a639eebd711622be52e9de1a9f') +sha1sums=('b0cf9e3071081fb6337191b1482d0f61867754dc') } From vmiklos at frugalware.org Fri Jun 2 03:19:07 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 03:19:09 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: add a '-c' switch to just determine the volume number (without actually generating the isos) Message-ID: <20060602011907.8E6CCFB4017@genesis.frugalware.org> [mkiso: add a '-c' switch to just determine the volume number (without actually generating the isos) VMiklos **20060602011524] { hunk ./mkiso/mkiso.c 281 -int mkiso(volume_t *volume) +int mkiso(volume_t *volume, int countonly) hunk ./mkiso/mkiso.c 358 - system(cmdline); + if(!countonly) + system(cmdline); + else + printf("expected volume number: %d\n", myvolume); hunk ./mkiso/mkiso.c 444 -int prepare(volume_t *volume, char *tmproot) +int prepare(volume_t *volume, char *tmproot, int countonly) hunk ./mkiso/mkiso.c 519 - mkiso(volume); + mkiso(volume, countonly); hunk ./mkiso/mkiso.c 529 - int i; + int i, countonly=0; hunk ./mkiso/mkiso.c 533 - free(xmlfile); - xmlfile = strdup(argv[1]); + if(strcmp(argv[1], "-c")) + { + free(xmlfile); + xmlfile = strdup(argv[1]); + } + else + { + countonly=1; + } hunk ./mkiso/mkiso.c 549 - if(prepare(g_list_nth_data(volumes, i), tmproot)) + if(prepare(g_list_nth_data(volumes, i), tmproot, countonly)) } From vmiklos at frugalware.org Fri Jun 2 03:25:01 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 03:25:03 2006 Subject: [Frugalware-darcs] frugalware-current: totem-1.4.1-2-i686 Message-ID: <20060602012501.89EB8FB4017@genesis.frugalware.org> [totem-1.4.1-2-i686 VMiklos **20060602012358 compiled against new firefox / bump pkgrel ] { hunk ./source/gnome/totem/FrugalBuild 1 -# Last modified: Mon, 15 May 2006 01:26:50 +0000 +# Last modified: Fri, 02 Jun 2006 03:22:45 +0200 hunk ./source/gnome/totem/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/gnome/totem/FrugalBuild 15 -makedepends=('intltool' 'firefox=1.5.0.3' 'pango' 'gnome-icon-theme' 'nautilus') +makedepends=('intltool' 'firefox=1.5.0.4' 'pango' 'gnome-icon-theme' 'nautilus') } From crazy at frugalware.org Fri Jun 2 03:26:43 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 03:26:45 2006 Subject: [Frugalware-darcs] frugalware-current: kdepim-docs-3.5.3-1-i686 Message-ID: <20060602012643.92AA4FB4017@genesis.frugalware.org> [kdepim-docs-3.5.3-1-i686 crazy **20060602012522 * Version bump * huch forgot this one :) ] { hunk ./extra/source/kde/kdepim-docs/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 08:47:03 +0200 +# Last Modified: Fri, 02 Jun 2006 03:23:47 +0200 hunk ./extra/source/kde/kdepim-docs/FrugalBuild 7 -pkgver=3.5.2 +pkgver=3.5.3 hunk ./extra/source/kde/kdepim-docs/FrugalBuild 12 -rodepends=('kdepim>=3.5.2') -makedepends=('kdelibs>=3.5.2') +rodepends=('kdepim>=3.5.3') +makedepends=('kdelibs>=3.5.3') hunk ./extra/source/kde/kdepim-docs/FrugalBuild 16 -sha1sums=('1907bc219d2dd51a376a99d0f7e6b9af97d5adf7') +sha1sums=('c957fffefaa73e8be670b2a2d639b82205fe5309') hunk ./extra/source/kde/kdepim-docs/FrugalBuild 29 -# vim: ft=sh - -# optimalization OK } From crazy at frugalware.org Fri Jun 2 03:36:41 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 03:36:43 2006 Subject: [Frugalware-darcs] frugalware-current: libpypac-0.6.3-1-i686 Message-ID: <20060602013641.74DDDFB4017@genesis.frugalware.org> [libpypac-0.6.3-1-i686 crazy **20060602013536 * source()|up2date() fix ( stable tree died :S ) ] { hunk ./extra/source/xlib/libpypac/FrugalBuild 13 -up2date="lynx -dump http://download.gna.org/libpypac/libpypac/ | grep 'tar.gz' | sed -ne 's/.*-//;s/\.tar\.gz//;2 p'" -source=(http://download.gna.org/libpypac/libpypac/$pkgname-$pkgver.tar.gz) +up2date="lynx -dump http://download.gna.org/libpypac/libpypac-devel/|grep '.tar.gz$'|sort -r -n|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" +source=(http://download.gna.org/libpypac/libpypac-devel/$pkgname-$pkgver.tar.gz) hunk ./extra/source/xlib/libpypac/FrugalBuild 17 -# vim: ft=sh } From vmiklos at frugalware.org Fri Jun 2 03:38:45 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 03:38:46 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: memleak fix in prepare() Message-ID: <20060602013845.8FADCFB4017@genesis.frugalware.org> [mkiso: memleak fix in prepare() VMiklos **20060602013553] { hunk ./mkiso/mkiso.c 522 + g_list_free(isopkgs); + isopkgs=NULL; } From vmiklos at frugalware.org Fri Jun 2 03:40:44 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 03:40:45 2006 Subject: [Frugalware-darcs] frugalware-current: yelp-2.14.2-1-i686 Message-ID: <20060602014044.4DC5CFB4017@genesis.frugalware.org> [yelp-2.14.2-1-i686 VMiklos **20060602013944 compiled against new firefox / bump pkgrel smp fix ] { hunk ./source/gnome/yelp/FrugalBuild 1 -# Last modified: Sun, 21 May 2006 16:59:09 +0200 +# Last modified: Fri, 02 Jun 2006 03:37:00 +0200 hunk ./source/gnome/yelp/FrugalBuild 7 -pkgver=2.14.1 -pkgrel=2 +pkgver=2.14.2 +pkgrel=1 hunk ./source/gnome/yelp/FrugalBuild 11 -depends=('libgnomeui' 'libxslt' 'firefox>=1.5.0.3-2' 'libxml2' 'gtk+2' 'startup-notification') +depends=('libgnomeui' 'libxslt' 'firefox>=1.5.0.4' 'libxml2' 'gtk+2' 'startup-notification') hunk ./source/gnome/yelp/FrugalBuild 19 + unset MAKEFLAGS hunk ./source/gnome/yelp/FrugalBuild 27 -sha1sums=('604b85ea7e13738dc1c812adf644504980f26476') +sha1sums=('7cc81e80825425d8344892db2beda82ccd28293e') } From crazy at frugalware.org Fri Jun 2 04:00:29 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 04:00:31 2006 Subject: [Frugalware-darcs] frugalware-current: hunlatex-0.03_3-1-i686 Message-ID: <20060602020029.5BDDCFB4017@genesis.frugalware.org> [hunlatex-0.03_3-1-i686 crazy **20060602015931 * up2date() fix ] { hunk ./extra/source/xapps/hunlatex/FrugalBuild 14 -up2date="lynx -dump http://www.math.bme.hu/latex/dl/ | grep 'magyarlatex_.*.deb' | tail -n 1 | sed 's/.*magyarlatex_\(.*\)_i386.deb.*/\1/; s/-/_/'" +up2date="lynx -dump ynx -dump $url/dl/|grep 'magyarlatex_'|sort -n -r |head -n 1|sed -e 's/.*_\(.*\)_.*/\1/' -e 's/-/_/'" } From crazy at frugalware.org Fri Jun 2 12:04:19 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 12:04:21 2006 Subject: [Frugalware-darcs] frugalware-current: kdevelop-3.3.3-1-i686 Message-ID: <20060602100419.56340FB4017@genesis.frugalware.org> [kdevelop-3.3.3-1-i686 crazy **20060602095502 * Version bump ] { hunk ./extra/source/kde/kdevelop/FrugalBuild 1 -# Last Modified: Fri, 31 Mar 2006 07:22:22 +0200 +# Last Modified: Fri, 02 Jun 2006 05:28:31 +0200 hunk ./extra/source/kde/kdevelop/FrugalBuild 6 -pkgver=3.3.2 +pkgver=3.3.3 hunk ./extra/source/kde/kdevelop/FrugalBuild 11 -depends=('kdebase>=3.5.2' 'kdesdk>=3.5.2' 'gettext' 'make' 'flex' 'automake' 'autoconf' 'htdig') -makedepends=('cvs' 'kde-apidox') +depends=('kdebase>=3.5.3' 'kdesdk>=3.5.3' 'gettext' 'make' 'flex' 'automake' 'autoconf' 'htdig' 'valgrind') +makedepends=('cvs' 'kde-apidox' 'qt-docs' 'doxygen') hunk ./extra/source/kde/kdevelop/FrugalBuild 14 -options=('scriptlet') hunk ./extra/source/kde/kdevelop/FrugalBuild 15 -sha1sums=('5763fdfc4f44f9828db42184243e3e3a95ffe54a') +sha1sums=('e8e74fb7bc8d059cb2ba96778d500f3ea9566f8e') hunk ./extra/source/kde/kdevelop/FrugalBuild 32 -# optimalization OK hunk ./extra/source/kde/kdevelop/FrugalBuild 34 +# optimization OK + } From alex.extreme2 at gmail.com Fri Jun 2 12:05:26 2006 From: alex.extreme2 at gmail.com (alex_extreme) Date: Fri Jun 2 12:05:28 2006 Subject: [Frugalware-darcs] frugalware-current: skype-1.2.0.18-1-i686 Message-ID: <20060602100526.EF8C9FB4019@genesis.frugalware.org> [skype-1.2.0.18-1-i686 alex_extreme **20060602100342 * why are there runtime only depends in depends=()? moved to rodepends instead * zip is not a makedepend... ] { hunk ./extra/source/xapps/skype/FrugalBuild 1 -# Last modified: Wed, 26 Oct 2005 17:18:41 +0200 +# Last modified: Fri, 02 Jun 2006 11:01:32 +0100 hunk ./extra/source/xapps/skype/FrugalBuild 10 -depends=('qt' 'gcc' 'libstdc++5') -makedepends=('zip') +rodepends=('qt' 'gcc' 'libstdc++5') } From vmiklos at frugalware.org Fri Jun 2 12:29:01 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 12:29:03 2006 Subject: [Frugalware-darcs] frugalware-current: pcmciautils-014-1-i686 Message-ID: <20060602102901.70CB6FB4017@genesis.frugalware.org> [pcmciautils-014-1-i686 VMiklos **20060602102731 version bump sha1sums() -> signatures() smp fix ] { hunk ./source/base/pcmciautils/FrugalBuild 1 -# Last Modified: Fri, 12 May 2006 16:39:42 +0200 +# Last Modified: Fri, 02 Jun 2006 12:27:01 +0200 hunk ./source/base/pcmciautils/FrugalBuild 6 -pkgver=013 -pkgrel=2 +pkgver=014 +pkgrel=1 hunk ./source/base/pcmciautils/FrugalBuild 18 -sha1sums=('6e0a903232788c8e0405416c7e5c7b34e9d118d4' \ - '81c0b5552ee252eeca1bff43b9c44fa15afa51b6') +signatures=("${source[0]}.sign" '') hunk ./source/base/pcmciautils/FrugalBuild 21 + unset MAKEFLAGS } From vmiklos at frugalware.org Fri Jun 2 12:42:09 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 12:42:11 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: drop TODO, all the items in it are done Message-ID: <20060602104209.D7BF1FB4017@genesis.frugalware.org> [mkiso: drop TODO, all the items in it are done VMiklos **20060602103911] { hunk ./mkiso/TODO 1 -extra repo on cds - need to test rmfile ./mkiso/TODO } From crazy at frugalware.org Fri Jun 2 13:33:44 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 13:33:46 2006 Subject: [Frugalware-darcs] frugalware-current: openslp-1.2.1-2-i686 Message-ID: <20060602113344.EB245FB4017@genesis.frugalware.org> [openslp-1.2.1-2-i686 crazy **20060602113034 * moved in from extra ( ohh man ) * changed m8r to myself * fixed err the whole build ? -- still need add a rc file * "note to self" never ever let desco add stuff you need agin .. ] { move ./extra/source/network/openslp ./source/network/openslp hunk ./source/network/openslp/FrugalBuild 1 -# Last Modified: Wed, 08 Jun 2005 17:13:05 +0200 -# Compiling Time: 0.01 SBU -# Maintainer: Miklos Nemeth +# Last Modified: Fri, 02 Jun 2006 13:21:47 +0200 +# Compiling Time: 0.58 SBU +# Maintainer: crazy +# Contributor: Miklos Nemeth hunk ./source/network/openslp/FrugalBuild 8 -pkgrel=1 -pkgdesc="Service Location Protocol" -url="http://www.openslp.org" -depends=() -backup=('etc/slp.conf' 'etc/slp.reg' 'slp.spi') -groups=('network-extra') +pkgrel=2 +pkgdesc="Service Location Protocol." +url="http://www.openslp.org/" +depends=('openssl' 'glibc') +backup=(etc/{slp.conf,spl.reg,slp.spi}) +groups=('network') hunk ./source/network/openslp/FrugalBuild 15 -up2date="lynx -dump $url | grep 'stable.*SLP' | sed 's/.*SLP \([0-9\.]*\) .*/\1/'" -source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +Finclude sourceforge +up2date="lynx -dump http://www.openslp.org/|grep -m1 'stable'|sed 's/.*SLP \(.*\) .*/\1/'" hunk ./source/network/openslp/FrugalBuild 19 -# optimalization OK +build() +{ + Fcd + Fconf --enable-slpv2-security \ + --with-gnu-ld + for noO3 in `find . -iname Makefile` + do + Fsed "-O3" "" $noO3 + done + make || return 1 + Fmakeinstall +} + +# optimization OK } From vmiklos at frugalware.org Fri Jun 2 14:52:32 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 14:52:35 2006 Subject: [Frugalware-darcs] pacman: libalpm: trans_init() and trans_release(): don't ignore handle->root when creating the lockfile Message-ID: <20060602125232.76541FB4019@genesis.frugalware.org> [libalpm: trans_init() and trans_release(): don't ignore handle->root when creating the lockfile VMiklos **20060602124811 see http://www.archlinux.org/pipermail/pacman-dev/2006-May/000370.html ] { hunk ./lib/libalpm/alpm.c 760 + char path[PATH_MAX]; + hunk ./lib/libalpm/alpm.c 768 - handle->lckfd = _alpm_lckmk(PM_LOCK); + snprintf(path, PATH_MAX, "%s/%s", handle->root, PM_LOCK); + handle->lckfd = _alpm_lckmk(path); hunk ./lib/libalpm/alpm.c 866 + char path[PATH_MAX]; hunk ./lib/libalpm/alpm.c 882 - if(_alpm_lckrm(PM_LOCK)) { - _alpm_log(PM_LOG_WARNING, _("could not remove lock file %s"), PM_LOCK); - alpm_logaction(_("warning: could not remove lock file %s"), PM_LOCK); + snprintf(path, PATH_MAX, "%s/%s", handle->root, PM_LOCK); + if(_alpm_lckrm(path)) { + _alpm_log(PM_LOG_WARNING, _("could not remove lock file %s"), path); + alpm_logaction(_("warning: could not remove lock file %s"), path); } From vmiklos at frugalware.org Fri Jun 2 14:52:32 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 14:52:36 2006 Subject: [Frugalware-darcs] pacman: HACKING: added --disable-po4a Message-ID: <20060602125232.D8812FB401B@genesis.frugalware.org> [HACKING: added --disable-po4a VMiklos **20060602124143] { hunk ./HACKING 4 -For developers, using --enable-debug --disable-doxygen --disable-fakeroot +For developers, using +--enable-debug --disable-doxygen --disable-fakeroot --disable-po4a } From vmiklos at frugalware.org Fri Jun 2 15:10:55 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 15:10:58 2006 Subject: [Frugalware-darcs] pacman: pacman: whitespace fix in pacman_sync() Message-ID: <20060602131055.E7C11FB4017@genesis.frugalware.org> [pacman: whitespace fix in pacman_sync() VMiklos **20060602130159] { hunk ./src/pacman/sync.c 722 - WARN(NL, _("couldn't create package cache, using /tmp instead")); + WARN(NL, _("couldn't create package cache, using /tmp instead\n")); } From vmiklos at frugalware.org Fri Jun 2 15:10:55 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 15:10:58 2006 Subject: [Frugalware-darcs] pacman: pacman: fix download path in pacman_sync() when downloading to /tmp Message-ID: <20060602131055.A43B2FB4019@genesis.frugalware.org> [pacman: fix download path in pacman_sync() when downloading to /tmp VMiklos **20060602130052] { hunk ./src/pacman/sync.c 724 - snprintf(ldir, PATH_MAX, "/tmp"); - if(alpm_set_option(PM_OPT_CACHEDIR, (long)ldir) == -1) { + snprintf(ldir, PATH_MAX, "%s/tmp", config->root); + if(alpm_set_option(PM_OPT_CACHEDIR, (long)"/tmp") == -1) { } From vmiklos at frugalware.org Fri Jun 2 15:57:09 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 15:57:10 2006 Subject: [Frugalware-darcs] frugalware-current: patch-2.5.9-1-i686 Message-ID: <20060602135709.15649FB4017@genesis.frugalware.org> [patch-2.5.9-1-i686 VMiklos **20060602135604 version bump ] { hunk ./source/base/patch/FrugalBuild 1 -# Last Modified: Fri, 03 Mar 2006 22:35:58 +0100 +# Last Modified: Fri, 02 Jun 2006 15:40:34 +0200 hunk ./source/base/patch/FrugalBuild 6 -pkgver=2.5.4 -pkgrel=2 +pkgver=2.5.9 +pkgrel=1 hunk ./source/base/patch/FrugalBuild 13 -up2date="lynx -dump 'http://ftp.gnu.org/pub/gnu/patch/?M=D'|grep tar.gz$|sed -n 's/.*h-\(.*\)\.t.*/\1/;1 p'" -source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('a12d520eba0dc35d1c4d50ec75b7684451a40de9') - +up2date="lynx -dump http://bent.latency.net/bent/darcs/patch-2.5.9/src/ |Flasttar" +source=(http://bent.latency.net/bent/darcs/patch-$pkgver/src/patch-$pkgver.tar.gz) hunk ./source/base/patch/FrugalBuild 16 +sha1sums=('9a69f7191576549255f046487da420989d2834a6') } From alex.extreme2 at gmail.com Fri Jun 2 17:00:31 2006 From: alex.extreme2 at gmail.com (alex_extreme) Date: Fri Jun 2 17:00:33 2006 Subject: [Frugalware-darcs] frugalware-current: vim-7.0-2-i686 Message-ID: <20060602150031.1A500FB4017@genesis.frugalware.org> [vim-7.0-2-i686 alex_extreme **20060602145905 * added a .desktop file and an icon ] { hunk ./source/xapps/gvim/FrugalBuild 1 -# Last Modified: Mon, 08 May 2006 20:37:11 +0200 +# Last Modified: Fri, 02 Jun 2006 15:58:10 +0100 hunk ./source/xapps/gvim/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xapps/gvim/FrugalBuild 15 -source=(ftp://ftp.vim.org/pub/vim/unix/vim-$pkgver.tar.bz2) -sha1sums=('38ef48cabf942d0dc804a794dcc6f002b9457fc8') +source=(ftp://ftp.vim.org/pub/vim/unix/vim-$pkgver.tar.bz2 $pkgname.xpm) +sha1sums=('38ef48cabf942d0dc804a794dcc6f002b9457fc8' + 'f7262c7429c42b7c1ef9cf1eaa6aa12292933525') hunk ./source/xapps/gvim/FrugalBuild 28 + Ficon ../$pkgname.xpm + Fdesktop $pkgname $pkgname.xpm "Utility;TextEditor;" addfile ./source/xapps/gvim/gvim.xpm hunk ./source/xapps/gvim/gvim.xpm 1 +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"32 32 8 1", +" c Gray0", +". c #000080", +"X c #008000", +"o c Green", +"O c #808080", +"+ c #c0c0c0", +"@ c Gray100", +"# c None", +/* pixels */ +"############### ###############", +"############## oo ##############", +"### oXXo # ###", +"## @@@@@@@@@@@ XXXo @@@@@@@@@ ##", +"## @+++++++++++ XXX @+++++++++ #", +"### ++++++++++O XXXX ++++++++O #", +"#### O++++++OO XXXXXX O+++++OO #", +"#### @++++++O XXXXXX @+++++OO ##", +"#### @++++++O XXXXX @@++++OO ###", +"#### @++++++O XXXX @@++++OO ####", +"#### @++++++O XXX @@++++OO #####", +"#### @++++++O XX @@++++OO . ####", +"### @++++++O X @@++++OO XX. ###", +"## o @++++++O @@++++OO XXXX. ##", +"# oX @++++++O @@++++OO XXXXXX. #", +" oXX @++++++O@@++++OO XXXXXXXX. ", +" oXX @++++++O@++++OO XXXXXXXXX. ", +"# oX @++++++O++++OO XXXXXXXXX. #", +"## o @++++++++++ XXXXXXXXX. ##", +"### @+++++++++ ++ XXXXXXXX. ###", +"#### @+++++++++ ++ XXXXXXX. ####", +"#### @++++++++O X X ###", +"#### @+++++++O +++ +++ +++ ++ ##", +"#### @++++++OO ++ ++++++++++ #", +"#### @+++++OO ++ ++..++ + ##", +"#### @++++OO X ++ ++. ++ ++ ##", +"#### @+++OO XX ++ ++ ++ ++ ##", +"#### @++OO X ++ ++ ++ ++ ###", +"##### +OO ## +++ ++ ++ +++ ##", +"###### #### . ## ## ###", +"############## .. ##############", +"############### ###############" +}; } From vmiklos at frugalware.org Fri Jun 2 18:13:24 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 18:13:27 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: added a simple help (-h||--help) Message-ID: <20060602161324.A4822FB4019@genesis.frugalware.org> [mkiso: added a simple help (-h||--help) VMiklos **20060602160849] { hunk ./mkiso/mkiso.c 404 + if(!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) + { + printf("usage: %s [ -h ] [ -c | volumes.xml ]\n", argv[0]); + free(xmlfile); + return(0); + } } From vmiklos at frugalware.org Fri Jun 2 18:13:25 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 18:13:28 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: added clean target to the Makefile Message-ID: <20060602161325.21B42FB401A@genesis.frugalware.org> [mkiso: added clean target to the Makefile VMiklos **20060602160259] { hunk ./mkiso/Makefile 1 +CFLAGS ?= -Wall -Werror -g -O2 -pipe hunk ./mkiso/Makefile 3 -CFLAGS ?= -g -Wall -Werror hunk ./mkiso/Makefile 7 + hunk ./mkiso/Makefile 10 +clean: + rm -f *.o mkiso + } From vmiklos at frugalware.org Fri Jun 2 18:13:25 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 18:13:29 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: move the xml functions to a separate file Message-ID: <20060602161325.93F90FB401A@genesis.frugalware.org> [mkiso: move the xml functions to a separate file VMiklos **20060602155943] { hunk ./mkiso/Makefile 7 -all: mkiso +mkiso: mkiso.o xml.o hunk ./mkiso/mkiso.c 1 +/* + * mkiso.c + * + * Copyright (c) 2006 by Miklos Vajna + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + hunk ./mkiso/mkiso.c 29 -#include hunk ./mkiso/mkiso.c 31 -#include -#include - -typedef struct __volume_t -{ - char *arch; - char *media; - int serial; - int size; -} volume_t; hunk ./mkiso/mkiso.c 32 -typedef struct __isopkg_t -{ - PM_PKG *pkg; - int priority; -} isopkg_t; +#include "xml.h" +#include "mkiso.h" hunk ./mkiso/mkiso.c 41 -// for 650Mb = 1024*650 = 681574400 bytes with about 11Mb to spare -// FIXME: correct this after the kernel&initrd FIXME is done -#define CD_SIZE 665600 -#define DVD_SIZE 4590208 - -char *getarch() -{ - struct utsname name; - - uname (&name); - return(strdup(name.machine)); -} - -char *get_timestamp() -{ - time_t t; - struct tm *tm; - char buf[9]; - - t = time(NULL); - tm = localtime(&t); - - sprintf(buf, "20%02d%02d%02d", tm->tm_year-100, tm->tm_mon+1, tm->tm_mday); - return(strdup(buf)); -} - -int parseVolume(xmlDoc *doc, xmlNode *cur) -{ - xmlChar *key; - cur = cur->xmlChildrenNode; - volume_t *volume; - - if((volume = (volume_t *)malloc(sizeof(volume_t)))==NULL) - { - fprintf(stderr, "out of memory!\n"); - return(1); - } - memset(volume, 0, sizeof(volume_t)); - while (cur != NULL) - { - key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); - if ((!xmlStrcmp(cur->name, (const xmlChar *)"arch"))) - volume->arch = strdup((char*)key); - if ((!xmlStrcmp(cur->name, (const xmlChar *)"media"))) - volume->media = strdup((char*)key); - if ((!xmlStrcmp(cur->name, (const xmlChar *)"serial"))) - volume->serial = atoi((char*)key); - if ((!xmlStrcmp(cur->name, (const xmlChar *)"size"))) - volume->size = atoi((char*)key); - xmlFree(key); - cur = cur->next; - } - if(!volume->arch) - { - volume->arch = getarch(); - } - if(!volume->media) - { - fprintf(stderr, "media directive for a volume is required!\n"); - return(1); - } - if(!volume->serial && strcmp(volume->media, "net")) - { - fprintf(stderr, "media serial for a cd/dvd is required!\n"); - return(1); - } - if(!volume->size) - { - if(!strcmp(volume->media, "cd")) - volume->size=CD_SIZE; - else if(!strcmp(volume->media, "dvd")) - volume->size=DVD_SIZE; - } - volumes = g_list_append(volumes, volume); - return(0); -} - -int parseVolumes(char *docname) -{ - xmlDocPtr doc; - xmlNodePtr cur; - xmlChar *key; - - doc = xmlParseFile(docname); - - if(doc == NULL) - { - fprintf(stderr, "document not parsed successfully\n"); - return(1); - } - - cur = xmlDocGetRootElement(doc); - - if(cur == NULL) - { - fprintf(stderr, "empty document\n"); - xmlFreeDoc(doc); - return(1); - } - - if(xmlStrcmp(cur->name, (const xmlChar *)"volumes")) - { - fprintf(stderr, "document of the wrong type, root node != volumes"); - xmlFreeDoc(doc); - return(1); - } - - cur = cur->xmlChildrenNode; - while(cur != NULL) - { - key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); - if((!xmlStrcmp(cur->name, (const xmlChar *)"fst_root"))) - fst_root = strdup((char*)key); - else if((!xmlStrcmp(cur->name, (const xmlChar *)"version"))) - fst_ver = strdup((char*)key); - else if((!xmlStrcmp(cur->name, (const xmlChar *)"volume"))) - if(parseVolume(doc, cur)) - return(1); - xmlFree(key); - cur = cur->next; - } - if(!fst_root) - { - fprintf(stderr, "missing fst_root directive\n"); - return(1); - } - if(!fst_ver) - fst_ver = get_timestamp(); - if(!volumes) - { - fprintf(stderr, "at least one volume is required\n"); - return(1); - } - - xmlFreeDoc(doc); - return(0); -} - addfile ./mkiso/mkiso.h hunk ./mkiso/mkiso.h 1 +/* + * mkiso.h + * + * Copyright (c) 2006 by Miklos Vajna + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +// for 650Mb = 1024*650 = 681574400 bytes with about 11Mb to spare +// FIXME: correct this after the kernel&initrd FIXME is done +#define CD_SIZE 665600 +#define DVD_SIZE 4590208 + +typedef struct __volume_t +{ + char *arch; + char *media; + int serial; + int size; +} volume_t; + +typedef struct __isopkg_t +{ + PM_PKG *pkg; + int priority; +} isopkg_t; addfile ./mkiso/xml.c hunk ./mkiso/xml.c 1 +/* + * xml.c + * + * Copyright (c) 2006 by Miklos Vajna + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "mkiso.h" + +extern GList *volumes; +extern char *fst_root; +extern char *fst_ver; + +static char *get_arch() +{ + struct utsname name; + + uname (&name); + return(strdup(name.machine)); +} + +static char *get_timestamp() +{ + time_t t; + struct tm *tm; + char buf[9]; + + t = time(NULL); + tm = localtime(&t); + + sprintf(buf, "20%02d%02d%02d", tm->tm_year-100, tm->tm_mon+1, tm->tm_mday); + return(strdup(buf)); +} + +static int parseVolume(xmlDoc *doc, xmlNode *cur) +{ + xmlChar *key; + cur = cur->xmlChildrenNode; + volume_t *volume; + + if((volume = (volume_t *)malloc(sizeof(volume_t)))==NULL) + { + fprintf(stderr, "out of memory!\n"); + return(1); + } + memset(volume, 0, sizeof(volume_t)); + while (cur != NULL) + { + key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); + if ((!xmlStrcmp(cur->name, (const xmlChar *)"arch"))) + volume->arch = strdup((char*)key); + if ((!xmlStrcmp(cur->name, (const xmlChar *)"media"))) + volume->media = strdup((char*)key); + if ((!xmlStrcmp(cur->name, (const xmlChar *)"serial"))) + volume->serial = atoi((char*)key); + if ((!xmlStrcmp(cur->name, (const xmlChar *)"size"))) + volume->size = atoi((char*)key); + xmlFree(key); + cur = cur->next; + } + if(!volume->arch) + { + volume->arch = get_arch(); + } + if(!volume->media) + { + fprintf(stderr, "media directive for a volume is required!\n"); + return(1); + } + if(!volume->serial && strcmp(volume->media, "net")) + { + fprintf(stderr, "media serial for a cd/dvd is required!\n"); + return(1); + } + if(!volume->size) + { + if(!strcmp(volume->media, "cd")) + volume->size=CD_SIZE; + else if(!strcmp(volume->media, "dvd")) + volume->size=DVD_SIZE; + } + volumes = g_list_append(volumes, volume); + return(0); +} + +int parseVolumes(char *docname) +{ + xmlDocPtr doc; + xmlNodePtr cur; + xmlChar *key; + + doc = xmlParseFile(docname); + + if(doc == NULL) + { + fprintf(stderr, "document not parsed successfully\n"); + return(1); + } + + cur = xmlDocGetRootElement(doc); + + if(cur == NULL) + { + fprintf(stderr, "empty document\n"); + xmlFreeDoc(doc); + return(1); + } + + if(xmlStrcmp(cur->name, (const xmlChar *)"volumes")) + { + fprintf(stderr, "document of the wrong type, root node != volumes"); + xmlFreeDoc(doc); + return(1); + } + + cur = cur->xmlChildrenNode; + while(cur != NULL) + { + key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); + if((!xmlStrcmp(cur->name, (const xmlChar *)"fst_root"))) + fst_root = strdup((char*)key); + else if((!xmlStrcmp(cur->name, (const xmlChar *)"version"))) + fst_ver = strdup((char*)key); + else if((!xmlStrcmp(cur->name, (const xmlChar *)"volume"))) + if(parseVolume(doc, cur)) + return(1); + xmlFree(key); + cur = cur->next; + } + if(!fst_root) + { + fprintf(stderr, "missing fst_root directive\n"); + return(1); + } + if(!fst_ver) + fst_ver = get_timestamp(); + if(!volumes) + { + fprintf(stderr, "at least one volume is required\n"); + return(1); + } + + xmlFreeDoc(doc); + return(0); +} addfile ./mkiso/xml.h hunk ./mkiso/xml.h 1 +/* + * xml.h + * + * Copyright (c) 2006 by Miklos Vajna + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +int parseVolumes(char *docname); } From vmiklos at frugalware.org Fri Jun 2 18:18:12 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 18:18:13 2006 Subject: [Frugalware-darcs] frugalware-current: xine-lib-1.1.1-2-i686 Message-ID: <20060602161812.36CD3FB4017@genesis.frugalware.org> [xine-lib-1.1.1-2-i686 VMiklos **20060602161603 added SA20369.diff closes #803 ] { hunk ./source/xlib/xine-lib/FrugalBuild 1 -# Last Modified: Sun, 20 Nov 2005 13:33:01 +0100 +# Last Modified: Fri, 02 Jun 2006 16:28:36 +0200 hunk ./source/xlib/xine-lib/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/xlib/xine-lib/FrugalBuild 15 -source=(http://dl.sourceforge.net/sourceforge/xine/$pkgname-$pkgver.tar.gz) -sha1sums=('c06aa67ad4d161434fc629232d742b5c7fd3cb4c') +source=(http://dl.sourceforge.net/sourceforge/xine/$pkgname-$pkgver.tar.gz \ + SA20369.diff) +sha1sums=('c06aa67ad4d161434fc629232d742b5c7fd3cb4c' \ + 'e08639a2efb094803727df52338be4f2f8fb49e7') hunk ./source/xlib/xine-lib/FrugalBuild 32 -# vim: ft=sh +# optimization OK addfile ./source/xlib/xine-lib/SA20369.diff hunk ./source/xlib/xine-lib/SA20369.diff 1 +http://xine.cvs.sourceforge.net/xine/xine-lib/src/input/input_http.c?r1=1.114&r2=1.115&view=patch +--- xine-lib/src/input/input_http.c 2006/05/03 19:46:07 1.114 ++++ xine-lib/src/input/input_http.c 2006/05/31 20:58:22 1.115 +@@ -895,6 +895,12 @@ + len = 0; + } else + len ++; ++ if ( len >= buflen ) { ++ _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL); ++ xine_log (this->stream->xine, XINE_LOG_MSG, ++ _("input_http: buffer exahuested after %d bytes."), buflen); ++ return 0; ++ } + } + + lprintf ("end of headers\n"); } From vmiklos at frugalware.org Fri Jun 2 18:37:21 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 18:37:23 2006 Subject: [Frugalware-darcs] frugalware-current: erss-20060205-1-i686 Message-ID: <20060602163722.009B5FB4017@genesis.frugalware.org> [erss-20060205-1-i686 VMiklos **20060602163557 dropped, obsolete ] { hunk ./extra/source/e17/erss/FrugalBuild 1 -# Last modified: Mon, 13 Feb 2006 22:52:03 +0100 -# Compiling time: ~0.06 SBU -# Maintainer: voroskoi - -pkgname=erss -pkgver=20060205 -pkgrel=1 -pkgdesc="eRSS is a simple tool for watching RSS v1 (RDF) and v2 (XML) feeds." -depends=('edje' 'esmart' 'etox' 'libxml2' 'imlib2') -groups=('e17-extra' 'e17-misc') -archs=('i686' 'x86_64') -Finclude e17-cvs -sha1sums=('9d2f826fae723e2cb969820e1b7da71686e6abdf') - -# vim: ft=sh - -# optimalization OK - -# optimization OK rmfile ./extra/source/e17/erss/FrugalBuild rmdir ./extra/source/e17/erss } From crazy at frugalware.org Fri Jun 2 18:46:16 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 18:46:18 2006 Subject: [Frugalware-darcs] frugalware-current: ortp-0.7.1-1-i686 Message-ID: <20060602164616.890D7FB4019@genesis.frugalware.org> [ortp-0.7.1-1-i686 crazy **20060602164411 * downgraded for now >0.7.1 has already a new API :/ ] { hunk ./source/apps/ortp/FrugalBuild 1 -# Last Modified: Sat, 06 May 2006 02:01:15 +0200 +# Last Modified: Fri, 02 Jun 2006 18:43:04 +0200 hunk ./source/apps/ortp/FrugalBuild 6 -pkgver=0.9.1 +pkgver=0.7.1 hunk ./source/apps/ortp/FrugalBuild 15 -sha1sums=('72a60bbf8bd5cdde3fa899eb537a6bc59b6013e8') +sha1sums=('a2b67ab75858ca0a059ab6eeb0cdaf4f3126e93d') + +## DO NOT BUMP _YET_ I need this one , >0.7.1 uses some new API } From iron at frugalware.org Fri Jun 2 18:55:50 2006 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jun 2 18:55:52 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: changed xml file handling and added docs.php Message-ID: <20060602165550.35554FB4017@genesis.frugalware.org> [fwng: changed xml file handling and added docs.php Krisztian VASAS **20060602165024 - changed xml file handling (new variable: $docs_path) now handles local copy of xml files of if not exists, then from $docs_path/xml changed in all files that used xml - added docs.php ] { hunk ./frugalware/authors.php 21 -// include some useful functions +// include some useful functions and the config hunk ./frugalware/authors.php 23 +include("config.inc.php"); hunk ./frugalware/authors.php 27 -$xmlfile = "xml/authors.xml"; hunk ./frugalware/authors.php 35 -// include the config and let's start page -include("config.inc.php"); +// let's start page hunk ./frugalware/authors.php 44 - $xmlfile="xml/authors.xml"; + if (file_exists("xml/authors.xml")) + $xmlfile = "xml/authors.xml"; + else + $xmlfile = $docs_path."/xml/authors.xml"; hunk ./frugalware/authors.php 68 - $xmlfile="xml/contributors.xml"; + if(file_exists("xml/contributors.xml")) + $xmlfile = "xml/contributors.xml"; + else + $xmlfile = "xml/contributors.xml"; hunk ./frugalware/config.inc.php 16 +$docs_path = "/home/ftp/pub/frugalware/frugalware-current/docs"; addfile ./frugalware/docs.php hunk ./frugalware/docs.php 1 + + * + * @copyright Copyright (c) 2006. Krisztian VASAS + * @copyright Copyright (c) 2005-2006. Miklos Vajna + */ + +// include some useful functions and the config +include("functions.inc.php"); +include("config.inc.php"); + +$lang = getlang(); +$llang = getllang($lang); + +// set the locale settings for gettext +putenv("LANG=".$llang); +setlocale(LC_ALL,$llang); +$domain = 'messages'; +bindtextdomain($domain, "locale"); +textdomain($domain); + +// let's start page +include("header.php"); +$langs = array(); +$txtdir = $docs_path."/txt"; +$htmldir = $docs_path."/html"; + +if ($dir = @opendir($txtdir)) +{ + while($what = readdir($dir)) + { + if ($what != "." && $what != ".." && is_dir($txtdir."/".$what)) + { + if (!in_array($what, $langs)) + $langs[] = $what; + $txtlangs[$what] = 1; + $txtnlangs[$what] = getnlang($what); + } + } +} +closedir($dir); + +if ($dir = @opendir($htmldir)) +{ + while($what = readdir($dir)) + { + if ($what != "." && $what != ".." && is_dir($htmldir."/".$what)) + { + if (!in_array($what, $langs)) + $langs[] = $what; + $htmllangs[$what] = 1; + $htmlnlangs[$what] = getnlang($what); + } + } +} +closedir($dir); + +$content = ""; +for ( $i=0; $iHTML"; + if ($txtlangs[$foo] == 1) + { + $content .= gettext(" or ")."".gettext("Plain text")."\n"; + } + else + { + $content .= "\n"; + } + } + else + { + if ($txtlangs[$foo] == 1) + { + $content .= "
  • ".gettext($txtnlangs[$foo]).": ".gettext("Plain text")."
    • \n"; + } + } +} + +if ($content != "") + $cont = "
      \n".$content."
    \n"; +else + $cont = gettext("Sorry, no documentation available currently"); + +fwmiddlebox(gettext("View online documentation"), $cont); + +include("footer.php"); +?> hunk ./frugalware/download.php 23 -// include some useful functions +// include some useful functions and the config hunk ./frugalware/download.php 25 +include("config.inc.php"); hunk ./frugalware/download.php 29 -$mirrorsfile = "xml/mirrors.xml"; +if (file_exists("xml/mirrors.xml")) + $mirrorsfile = "xml/mirrors.xml"; +else + $mirrorsfile = $docs_path."/xml/mirrors.xml"; hunk ./frugalware/download.php 41 -// include the config and let's start page -include("config.inc.php"); +// let's start page hunk ./frugalware/functions.inc.php 140 + +function getnlang($lang) +{ + $nlangs = array( + "en_US" => "English", + "hu_HU" => "Hungarian" + ); + return $nlangs[$lang]; +} hunk ./frugalware/header.php 1 + hunk ./frugalware/index.php 21 -// include some useful functions +// include some useful functions and the config hunk ./frugalware/index.php 23 +include("config.inc.php"); hunk ./frugalware/index.php 28 -$xmlfile = "xml/news".$flang.".xml"; +if (file_exists("xml/news".$flang.".xml")) + $xmlfile = "xml/news".$flang.".xml"; +else + $xmlfile = $docs_path."/xml/news".$flang.".xml"; hunk ./frugalware/index.php 40 -// include the config and let's start page -include("config.inc.php"); +// let's start page hunk ./frugalware/index.php 51 - $xmlfile = "xml/news.xml"; + if (file_exists("xml/news.xml")) + $xmlfile = "xml/news.xml"; + else + $xmlfile = $docs_path."/xml/news.xml"; hunk ./frugalware/media.php 21 -// Include some useful functions +// Include some useful functions and the config hunk ./frugalware/media.php 23 +include('config.inc.php'); hunk ./frugalware/media.php 28 -$xmlfile = 'xml/media.xml'; +if (file_exists('xml/media.xml')) + $xmlfile = 'xml/media.xml'; +else + $xmlfile = $docs_path.'xml/media.xml'; hunk ./frugalware/media.php 40 -// Include the config and start the page -include('config.inc.php'); +// Let's start the page hunk ./frugalware/roadmap.php 26 -// Include some useful functions +// Include some useful functions and the config hunk ./frugalware/roadmap.php 28 +include('config.inc.php'); hunk ./frugalware/roadmap.php 33 -$xmlfile = 'xml/roadmap.xml'; +if (file_exists('xml/roadmap.xml')) + $xmlfile = 'xml/roadmap.xml'; +else + $xmlfile = $docs_path.'xml/roadmap.xml'; hunk ./frugalware/roadmap.php 45 -// Include the config and start the page -include('config.inc.php'); +// Let's start the page } From iron at frugalware.org Fri Jun 2 18:56:56 2006 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jun 2 18:56:57 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: added docs.php to menu Message-ID: <20060602165656.53F1BFB4019@genesis.frugalware.org> [fwng: added docs.php to menu Krisztian VASAS **20060602165639] { hunk ./frugalware/config.inc.php 37 -$menucontent .= ' ' . gettext('Documentation') . "\n"; +$menucontent .= ' ' . gettext('Documentation') . "\n"; } From iron at frugalware.org Fri Jun 2 18:58:18 2006 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jun 2 18:58:19 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: removed docs.php from TODO (solved) Message-ID: <20060602165818.80C44FB4019@genesis.frugalware.org> [fwng: removed docs.php from TODO (solved) Krisztian VASAS **20060602165752] { hunk ./frugalware/TODO 6 - * docs.php - ?? will do this } From crazy at frugalware.org Fri Jun 2 19:07:02 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 19:07:04 2006 Subject: [Frugalware-darcs] frugalware-current: meanwhile-1.0.2-1-i686 Message-ID: <20060602170702.6F4F7FB4019@genesis.frugalware.org> [meanwhile-1.0.2-1-i686 crazy **20060602170615 * New package ] { adddir ./source/apps/meanwhile addfile ./source/apps/meanwhile/FrugalBuild hunk ./source/apps/meanwhile/FrugalBuild 1 +# Last Modified: Fri, 02 Jun 2006 18:53:17 +0200 +# Compiling Time: 0.45 SBU +# Maintainer: crazy + +pkgname=meanwhile +pkgver=1.0.2 +pkgrel=1 +pkgdesc="Open implementation of the 'Lotus Sametime Community Client' protocol." +url="http://meanwhile.sourceforge.net/" +depends=('glib2') +makedepends=('doxygen') +groups=('apps') +archs=('i686') +Finclude sourceforge +up2date="lynx -dump http://meanwhile.sourceforge.net/download/|grep 'current Meanwhile'|sed 's/.*ile \(.*\),.*/\1/'" +sha1sums=('e0e9836581da3c4a569135cb238eaa566c324540') + +# optimization OK } From vmiklos at frugalware.org Fri Jun 2 19:29:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 19:29:25 2006 Subject: [Frugalware-darcs] pacman-tools: Makefile: include mkiso in compile/install/clean Message-ID: <20060602172923.16763FB4017@genesis.frugalware.org> [Makefile: include mkiso in compile/install/clean VMiklos **20060602162322] { hunk ./Makefile 34 + $(MAKE) -C mkiso hunk ./Makefile 74 + $(INSTALL) mkiso/mkiso $(DESTDIR)$(bindir)/mkiso hunk ./Makefile 78 + $(MAKE) -C mkiso clean } From vmiklos at frugalware.org Fri Jun 2 19:29:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 19:29:26 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: get rid of the hardcoded kernel&initrd size Message-ID: <20060602172923.80E47FB4017@genesis.frugalware.org> [mkiso: get rid of the hardcoded kernel&initrd size VMiklos **20060602172540] { hunk ./mkiso/Makefile 8 -mkiso: mkiso.o xml.o +mkiso: mkiso.o xml.o boot.o addfile ./mkiso/boot.c hunk ./mkiso/boot.c 1 +/* + * boot.c + * + * Copyright (c) 2006 by Miklos Vajna + * parts are from gzip, Copyright (C) 1992-1993 by Jean-loup Gailly + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include +#include +#include +#include +#include +#include + +/* Macros for getting two-byte and four-byte header values */ +#define SH(p) ((unsigned short)(unsigned char)((p)[0]) | ((unsigned short)(unsigned char)((p)[1]) << 8)) +#define LG(p) ((unsigned long)(SH(p)) | ((unsigned long)(SH((p)+2)) << 16)) + +int gunzip_size(char *path) +{ + int fd; + unsigned char buf[8]; + + fd = open(path, O_RDONLY); + lseek(fd, (off_t)(-8), SEEK_END); + read(fd, (char*)buf, sizeof(buf)); + return(LG(buf+4)); +} + +int boot_size(char *root, char *kernel, char *initrd) +{ + struct stat buf; + int ret; + char path[PATH_MAX+1]; + + snprintf(path, PATH_MAX, "%s/%s", root, kernel); + if(stat(path, &buf)) + return(0); + ret = buf.st_size/1024; + snprintf(path, PATH_MAX, "%s/%s", root, initrd); + if(stat(path, &buf)) + return(0); + ret += buf.st_size/1024; + return(ret); +} + +/*int main() +{ + printf("%d\n", + boot_size("/home/vmiklos/darcs/frugalware-current", "boot/vmlinuz-2.6.16-fw5-i686", "boot/initrd-i686.img.gz")); +}*/ addfile ./mkiso/boot.h hunk ./mkiso/boot.h 1 +/* + * boot.h + * + * Copyright (c) 2006 by Miklos Vajna + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +int gunzip_size(char *path); +int boot_size(char *root, char *kernel, char *initrd); hunk ./mkiso/mkiso.c 33 +#include "boot.h" hunk ./mkiso/mkiso.c 154 - int total=0, myvolume=1; + int total=0, myvolume=1, bootsize; hunk ./mkiso/mkiso.c 157 - char *flist, *cmdline, *ptr; + char *flist, *cmdline, *ptr, *kptr, *iptr; hunk ./mkiso/mkiso.c 172 - iso_add(fp, "boot/vmlinuz-%s", ptr); + kptr = g_strdup_printf("boot/vmlinuz-%s", ptr); hunk ./mkiso/mkiso.c 174 - iso_add(fp, "boot/initrd-%s.img.gz", volume->arch); + iso_add(fp, kptr); + iptr = g_strdup_printf("boot/initrd-%s.img.gz", volume->arch); + iso_add(fp, iptr); + // how many space is needed for the kernel & initrd? + bootsize = boot_size(fst_root, kptr, iptr); + free(kptr); + free(iptr); hunk ./mkiso/mkiso.c 197 - // FIXME: 20971520 is ~20mb for the initrd&kernel - if (total+size > volume->size - 20480) + if (total+size > volume->size - bootsize) hunk ./mkiso/mkiso.h 22 -// for 650Mb = 1024*650 = 681574400 bytes with about 11Mb to spare -// FIXME: correct this after the kernel&initrd FIXME is done -#define CD_SIZE 665600 -#define DVD_SIZE 4590208 +#define CD_SIZE 655360 +#define DVD_SIZE 4812800 } From vmiklos at frugalware.org Fri Jun 2 19:29:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 19:29:27 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso/volumes.xml: initial import Message-ID: <20060602172923.DC8CFFB4017@genesis.frugalware.org> [mkiso/volumes.xml: initial import VMiklos **20060602162544] { hunk ./Makefile 32 +docdir = /usr/share/doc/pacman-tools-$(VERSION) hunk ./Makefile 43 + $(INSTALL) -d $(DESTDIR)$(docdir) hunk ./Makefile 77 + $(INSTALL) -m644 mkiso/volumes.xml $(DESTDIR)$(docdir)/volumes.xml addfile ./mkiso/volumes.xml hunk ./mkiso/volumes.xml 1 + + + + + + + + +]> + + + /home/ftp/pub/frugalware/frugalware-current + + i686 + cd + 1 + + + i686 + net + + } From crazy at frugalware.org Fri Jun 2 20:25:55 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 20:25:59 2006 Subject: [Frugalware-darcs] frugalware-current: ilbc-1.0-1-i686 Message-ID: <20060602182555.BF945FB4017@genesis.frugalware.org> [ilbc-1.0-1-i686 crazy **20060602182451 * New package ] { adddir ./source/apps/ilbc addfile ./source/apps/ilbc/FrugalBuild hunk ./source/apps/ilbc/FrugalBuild 1 +# Last Modified: Fri, 02 Jun 2006 20:18:33 +0200 +# Compiling Time: 0.14 SBU +# Maintainer: crazy + +pkgname=ilbc +pkgver=1.0 +pkgrel=1 +pkgdesc="iLBC (internet Low Bitrate Codec) is a FREE speech codec suitable for robust voice communication over IP." +url="http://www.ilbcfreeware.org/" +depends=('glibc') +groups=('apps') +archs=('i686') +up2date="$pkgver" +source=(http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz) +sha1sums=('fc0950586a0a3e67f513b9a78745c54f05378e66') + +build() +{ + Fcd $pkgname-rfc3951 + Fbuild +} + + +# optimization OK } From vmiklos at frugalware.org Fri Jun 2 21:52:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 21:52:26 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: generate menu.lst automatically Message-ID: <20060602195223.36476FB4017@genesis.frugalware.org> [mkiso: generate menu.lst automatically VMiklos **20060602194026 this also means a new tag: (defaults to "-current") ] { hunk ./mkiso/Makefile 8 -mkiso: mkiso.o xml.o boot.o +mkiso: mkiso.o xml.o boot.o menu.o addfile ./mkiso/menu.c hunk ./mkiso/menu.c 1 +/* + * menu.c + * + * Copyright (c) 2006 by Miklos Vajna + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include +#include +#include +#include +#include + +#include "mkiso.h" +#include "boot.h" + +extern char *fst_root; +extern char *fst_ver; +extern char *fst_codename; + +char *mkmenu(volume_t *volume) +{ + char *flist = strdup("/tmp/mkiso_XXXXXX"); + FILE *fp; + char *kernel = detect_kernel(volume->arch); + char *ptr = g_strdup_printf("%s/boot/initrd-%s.img.gz", fst_root, volume->arch); + + mkstemp(flist); + if(!(fp = fopen(flist, "w"))) + return(NULL); + + fprintf(fp, "default=0\n" + "timeout=10\n" + "gfxmenu /boot/grub/message\n\n"); + fprintf(fp, "title Frugalware %s (%s) - %s\n", + fst_ver, fst_codename, kernel); + fprintf(fp, "\tkernel /boot/vmlinuz-%s initrd=initrd-%s.img.gz load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=%d rw root=/dev/ram quiet vga=791\n", + kernel, volume->arch, gunzip_size(ptr)/1024); + fprintf(fp, "\tinitrd /boot/initrd-%s.img.gz\n", + volume->arch); + fprintf(fp, "title Frugalware %s (%s) - %s (nofb)\n", + fst_ver, fst_codename, kernel); + fprintf(fp, "\tkernel /boot/vmlinuz-%s initrd=initrd-%s.img.gz load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=%d rw root=/dev/ram quiet vga=normal\n", + kernel, volume->arch, gunzip_size(ptr)/1024); + fprintf(fp, "\tinitrd /boot/initrd-%s.img.gz\n", + volume->arch); + + fclose(fp); + free(ptr); + free(kernel); + return(flist); +} addfile ./mkiso/menu.h hunk ./mkiso/menu.h 1 +/* + * menu.h + * + * Copyright (c) 2006 by Miklos Vajna + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +char *mkmenu(volume_t *volume); hunk ./mkiso/mkiso.c 32 +#include "mkiso.h" hunk ./mkiso/mkiso.c 35 -#include "mkiso.h" +#include "menu.h" hunk ./mkiso/mkiso.c 42 +char *fst_codename=NULL; hunk ./mkiso/mkiso.c 167 - char *flist, *cmdline, *ptr, *kptr, *iptr; + char *flist, *cmdline, *ptr, *kptr, *iptr, *menu; hunk ./mkiso/mkiso.c 191 - // FIXME: generate the menu.lst automatically - iso_add(fp, "boot/grub"); + iso_add(fp, "boot/grub/message"); + iso_add(fp, "boot/grub/stage2_eltorito"); + menu = mkmenu(volume); + fprintf(fp, "boot/grub/menu.lst=%s\n", menu); hunk ./mkiso/mkiso.c 252 + unlink(menu); + free(menu); hunk ./mkiso/mkiso.h 39 +char *detect_kernel(char *arch); + hunk ./mkiso/volumes.xml 3 - + hunk ./mkiso/xml.c 35 +extern char *fst_codename; hunk ./mkiso/xml.c 148 + else if((!xmlStrcmp(cur->name, (const xmlChar *)"codename"))) + fst_codename = strdup((char*)key); hunk ./mkiso/xml.c 165 + if(!fst_codename) + fst_codename = strdup("-current"); } From vmiklos at frugalware.org Fri Jun 2 21:52:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 21:52:28 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: new tag in xml: Message-ID: <20060602195223.6A48AFB401A@genesis.frugalware.org> [mkiso: new tag in xml: VMiklos **20060602184153] { hunk ./mkiso/mkiso.c 41 +char *out_dir=NULL; hunk ./mkiso/mkiso.c 98 + char *ptr=NULL; + + if(out_dir) + ptr = g_strdup_printf("%s/", out_dir); + else + ptr = strdup(""); hunk ./mkiso/mkiso.c 105 - return(g_strdup_printf("frugalware-%s-%s-%s%d.iso", version, arch, media, volume)); + return(g_strdup_printf("%sfrugalware-%s-%s-%s%d.iso", ptr, version, arch, media, volume)); hunk ./mkiso/mkiso.c 107 - return(g_strdup_printf("frugalware-%s-%s-%s.iso", version, arch, media)); + return(g_strdup_printf("%sfrugalware-%s-%s-%s.iso", ptr, version, arch, media)); + free(ptr); hunk ./mkiso/volumes.xml 3 - + hunk ./mkiso/xml.c 35 +extern char *out_dir; hunk ./mkiso/xml.c 147 + else if((!xmlStrcmp(cur->name, (const xmlChar *)"out_dir"))) + out_dir = strdup((char*)key); } From crazy at frugalware.org Fri Jun 2 21:55:30 2006 From: crazy at frugalware.org (crazy) Date: Fri Jun 2 21:55:32 2006 Subject: [Frugalware-darcs] frugalware-current: kdenetwork-3.5.3-2-i686 Message-ID: <20060602195530.CD6CCFB4019@genesis.frugalware.org> [kdenetwork-3.5.3-2-i686 crazy **20060602195349 * killed kopete off * depends() cleanup ] { hunk ./source/kde/kdenetwork/FrugalBuild 1 -# Last Modified: Wed, 31 May 2006 20:28:36 +0200 -# Compiling Time: 11.84 SBU +# Last Modified: Fri, 02 Jun 2006 21:35:20 +0200 +# Compiling Time: 3.97 SBU hunk ./source/kde/kdenetwork/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/kde/kdenetwork/FrugalBuild 11 -depends=('libxtst' 'kdebase>=3.5.2' 'perl-io-socket-ssl' 'ppp' 'qca-tls' 'gnutls' 'libidn' 'wireless_tools') -makedepends=('xmms') +depends=('libxtst' 'kdebase>=3.5.2' 'ppp' 'wireless_tools' 'openslp' 'libidn') hunk ./source/kde/kdenetwork/FrugalBuild 15 -Fconfopts="$Fconfopts --enable-new-ldflags" + + + +build() +{ + Fbuild CXXFLAGS="$CXXFLAGS -Wno-deprecated" \ + --disable-dependency-tracking \ + --disable-debug \ + --without-debug \ + --disable-warnings \ + --enable-new-ldflags \ + DO_NOT_COMPILE="kopete doc" \ + --enable-gcc-hidden-visibility \ + --with-gnu-ld \ + --enable-final +} } From vmiklos at frugalware.org Fri Jun 2 21:56:48 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Jun 2 21:56:50 2006 Subject: [Frugalware-darcs] frugalware-current: openoffice.org-2.0.2.9-1-i686 Message-ID: <20060602195648.A218BFB4017@genesis.frugalware.org> [openoffice.org-2.0.2.9-1-i686 VMiklos **20060602195610 s/ooo.ximian.com/go-oo.org/ update url ] { hunk ./source/xapps/openoffice.org/FrugalBuild 28 -url="http://ooo.ximian.com/" +url="http://www.openoffice.org/" hunk ./source/xapps/openoffice.org/FrugalBuild 54 -up2date="lynx -dump 'http://ooo.ximian.com/packages/OOB680/?C=M;O=A'|Flasttar" -source=(http://ooo.ximian.com/packages/$OOBVER/ooo-build-$pkgver.tar.gz \ +up2date="lynx -dump 'http://go-oo.org/packages/OOB680/?C=M;O=A'|Flasttar" +source=(http://go-oo.org/packages/$OOBVER/ooo-build-$pkgver.tar.gz \ } From iron at frugalware.org Fri Jun 2 22:42:04 2006 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jun 2 22:42:06 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: added changelog.php Message-ID: <20060602204204.E4A91FB4017@genesis.frugalware.org> [fwng: added changelog.php Krisztian VASAS **20060602204137] { addfile ./frugalware/changelog.php hunk ./frugalware/changelog.php 1 +", "@", "\n", "\r", " "), array("<", ">", "_at_", "", "", " "), $i); + if ($opennew) + { + $j++; + $opennew=false; + $title=$i; + } + else + { + $content .= $i."
    "; + } + } + else + { + fwmiddlebox($title, $content); + $opennew=true; + $content=""; + } + } +} +print "
    ".gettext("Read full current changelog")." ".gettext("here").".
     "; + +include("footer.php"); +?> hunk ./frugalware/config.inc.php 16 -$docs_path = "/home/ftp/pub/frugalware/frugalware-current/docs"; +$top_path = "/home/ftp/pub/frugalware/frugalware-current"; +$docs_path = $top_path."/docs"; hunk ./frugalware/config.inc.php 59 -$menucontent .= ' ' . gettext('ChangeLog') . "\n"; +$menucontent .= ' ' . gettext('ChangeLog') . "\n"; } From iron at frugalware.org Fri Jun 2 22:44:12 2006 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jun 2 22:44:14 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: deleted changelog.php from TODO (solved) Message-ID: <20060602204412.ED434FB4017@genesis.frugalware.org> [fwng: deleted changelog.php from TODO (solved) Krisztian VASAS **20060602204337] { hunk ./frugalware/TODO 5 - * changelog.php - ?? will do this } From janny at frugalware.org Fri Jun 2 22:54:45 2006 From: janny at frugalware.org (Janny) Date: Fri Jun 2 22:54:48 2006 Subject: [Frugalware-darcs] frugalware-current: zvbi-0.2.22-1-i686 Message-ID: <20060602205445.E7427FB4017@genesis.frugalware.org> [zvbi-0.2.22-1-i686 Janny **20060602205600 version bump ] { hunk ./extra/source/lib/zvbi/FrugalBuild 1 -# Last modified: Fri, 12 May 2006 10:11:18 +0200 +# Last modified: Thu, 01 Jun 2006 11:17:23 +0200 hunk ./extra/source/lib/zvbi/FrugalBuild 6 -pkgver=0.2.21 +pkgver=0.2.22 hunk ./extra/source/lib/zvbi/FrugalBuild 14 -up2date="lynx -dump http://prdownloads.sourceforge.net/zapping/?sort_by=date\&sort=desc|grep $pkgname-[0-9\.]*\.tar.bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://dl.sourceforge.net/sourceforge/zapping/$pkgname-$pkgver.tar.bz2) -sha1sums=('7fb50c60066c067b1528d333ad5ee24a14b38a2a') +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_dirname="zapping" +_F_sourceforge_prefix="zapping" +Finclude sourceforge +sha1sums=('79ea5f337e7ae5693b4e8674793ae04ae7bfb464') } From iron at frugalware.org Fri Jun 2 23:02:00 2006 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jun 2 23:02:01 2006 Subject: [Frugalware-darcs] frugalware-current: homepage: added main server donation to donations.php Message-ID: <20060602210200.31AD1FB4017@genesis.frugalware.org> [homepage: added main server donation to donations.php Krisztian VASAS **20060602205937] { hunk ./docs/homepage/frugalware/donations.php 33 +
  • Dell Optiplex P4 1.6GHz machine for main server
    • } From vmiklos at frugalware.org Sat Jun 3 00:30:32 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 00:30:36 2006 Subject: [Frugalware-darcs] pacman: scripts/*sync: generate %USIZE% directives for uncompressed sizes Message-ID: <20060602223032.92C6CFB4017@genesis.frugalware.org> [scripts/*sync: generate %USIZE% directives for uncompressed sizes VMiklos **20060602222442] { hunk ./scripts/gensync 80 + usize=`LANG= LC_ALL= pacman -Qi -p $pkgfile 2>/dev/null|grep ^Size|sed 's/.*: \(.*\)/\1/'` hunk ./scripts/gensync 120 + fi + if [ -n $usize ]; then + echo "%USIZE%" >>desc + echo "$usize" >>desc + echo "" >>desc hunk ./scripts/updatesync 83 + usize=`LANG= LC_ALL= pacman -Qi -p $pkgfile 2>/dev/null|grep ^Size|sed 's/.*: \(.*\)/\1/'` hunk ./scripts/updatesync 113 + echo "%USIZE%" >>desc + echo "$usize" >>desc + echo "" >>desc } From vmiklos at frugalware.org Sat Jun 3 00:43:58 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 00:44:00 2006 Subject: [Frugalware-darcs] pacman: updates for 3.3.1 Message-ID: <20060602224358.F15BCFB4017@genesis.frugalware.org> [updates for 3.3.1 VMiklos **20060602224036] { hunk ./NEWS 3 +3.3.1 - initial support for pkgdesc localization + - bugfix for -Qi and -Qm + - fix -Sg for multiple repos + - drop the NoUpgrade lines from the default config + - makepkg: when removing the pkg dir, remove the subpkgs' pkg + dir, too + - significant speedup while sorting dependencies with libalpm + - fixes for pacman's -r option in pacman and libalpm + - initial support for uncompressed package sizes in a sync repo hunk ./configure.ac 5 -AC_INIT([Pacman package manager], 3.3.0, [frugalware-devel@frugalware.org], pacman) +AC_INIT([Pacman package manager], 3.3.1, [frugalware-devel@frugalware.org], pacman) hunk ./configure.ac 24 -PM_MICRO_VERSION_SUFFIX=.0 +PM_MICRO_VERSION_SUFFIX=.1 } From vmiklos at frugalware.org Sat Jun 3 00:49:30 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 00:49:32 2006 Subject: [Frugalware-darcs] frugalware-current: pacman-3.3.1-1-i686 Message-ID: <20060602224930.1D88DFB4017@genesis.frugalware.org> [pacman-3.3.1-1-i686 VMiklos **20060602224754 version bump ] { hunk ./source/base/pacman/FrugalBuild 1 -# Last Modified: Sat, 20 May 2006 17:35:47 +0200 +# Last Modified: Sat, 03 Jun 2006 00:47:34 +0200 hunk ./source/base/pacman/FrugalBuild 6 -pkgver=3.3.0 -pkgrel=2 +pkgver=3.3.1 +pkgrel=1 hunk ./source/base/pacman/FrugalBuild 16 -source=($url/releases/$pkgname-$pkgver.tar.gz lang.diff) -signatures=(${source[0]}.asc '') +source=($url/releases/$pkgname-$pkgver.tar.gz) +signatures=(${source[0]}.asc) hunk ./source/base/pacman/lang.diff 1 -Sat May 20 17:24:57 CEST 2006 VMiklos - * pacman: typo fix in lang check -diff -rN -u old-pacman/src/pacman/pacman.c new-pacman/src/pacman/pacman.c ---- old-pacman/src/pacman/pacman.c 2006-05-20 17:29:18.000000000 +0200 -+++ new-pacman/src/pacman/pacman.c 2006-05-20 17:29:18.000000000 +0200 -@@ -436,7 +436,7 @@ - - setlocale(LC_ALL, lang); - // workaround for tr_TR -- if(!strcmp(lang, "tr_TR")) -+ if(lang && !strcmp(lang, "tr_TR")) - setlocale(LC_CTYPE, "C"); - bindtextdomain("pacman", "/usr/share/locale"); - textdomain("pacman"); - rmfile ./source/base/pacman/lang.diff } From vmiklos at frugalware.org Sat Jun 3 01:02:18 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 01:02:21 2006 Subject: [Frugalware-darcs] setup: postconf: fix $HOME before calling xconfig Message-ID: <20060602230218.D835DFB4019@genesis.frugalware.org> [postconf: fix $HOME before calling xconfig VMiklos **20060602225900] { hunk ./src/plugins/postconf.c 178 - system("chroot ./ /sbin/xconfig"); + system("chroot ./ su -c /sbin/xconfig"); } From crazy at frugalware.org Sat Jun 3 01:46:36 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 01:46:38 2006 Subject: [Frugalware-darcs] frugalware-current: ortp-0.7.1-2-i686 Message-ID: <20060602234636.F2E68FB4017@genesis.frugalware.org> [ortp-0.7.1-2-i686 crazy **20060602234411 * duh! depends() fix ( guess I need some sleep ? :P ) ] { hunk ./source/apps/ortp/FrugalBuild 1 -# Last Modified: Fri, 02 Jun 2006 18:43:04 +0200 +# Last Modified: Sat, 03 Jun 2006 01:43:53 +0200 hunk ./source/apps/ortp/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/apps/ortp/FrugalBuild 10 -depends=('glibc') +depends=('glib2') } From vmiklos at frugalware.org Sat Jun 3 02:14:31 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 02:14:34 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: added a manpage Message-ID: <20060603001431.638B0FB4017@genesis.frugalware.org> [mkiso: added a manpage VMiklos **20060603000835] { hunk ./Makefile 31 +man8dir = /usr/share/man/man8 hunk ./Makefile 43 + $(INSTALL) -d $(DESTDIR)$(man8dir) hunk ./Makefile 79 + $(INSTALL) -m644 mkiso/mkiso.8 $(DESTDIR)$(man8dir) addfile ./mkiso/mkiso.8 hunk ./mkiso/mkiso.8 1 +.TH "MKISO" "1" "Jun 2006" "Frugalware 0.5" "pacman-tools" +.SH NAME +mkiso \- Frugalware's program to generate ISO9660 images +.SH SYNOPSIS +\fBmkiso\fR [\f -h \fR] [\fI -c | volumes.xml\fR ] +.SH DESCRIPTION +.BR mkiso +is meant for anyone who wants to generate (custom) iso images +from the Frugalware Source Tree. +.SH USAGE +A typical iso generation should be done as follows: +.TP +Create a working directory: + +$ mkdir -p ~/iso +$ cd ~/iso + +.TP +Copy the descriptor xml template to there: + +$ cp /usr/share/doc/pacman-tools-*/volumes.xml ./ + +.TP +Change the fst_root to something like: + +/home/vmiklos/iso + +.TP +In this example we create a netinstall iso, so leave only the following entry: + +.nf + + i686 + net + +.fi + +.TP +Now we need a few base files: + +$ rsync -avP rsync://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/AUTHORS ./ + +$ rsync -avP rsync://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/ChangeLog.txt ./ + +$ rsync -avP rsync://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/LICENSE ./ + +.TP +We need documentation: + +$ rsync -avP rsync://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/docs ./ + +.TP +Then the kernel and the initrd: + +$ rsync -avP rsync://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/boot . + +.TP +Finally the packages and package databases. For the netinstall we can ignore the fpms: + +$ rsync -avP rsync://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/frugalware-i686 ./ --exclude '*fpm' + +$ mkdir extra + +$ rsync -avP rsync://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/extra/frugalware-i686 ./extra/ --exclude '*fpm' + +.TP +Ok, we have the necessary files, let's make the iso! + +$ mkiso + +.SH THE XML FILE + +In the xml file primarily you should define the wished volumes. At least the +media of the volume is required. The media can be "net", "cd", or "dvd". The +"net" will not contain any fpm package. The only difference between "cd" and "dvd" +is the default size. You can define the arch, which defaults to the machine +hardware name. For a cd or dvd a serial tag is required, 1 or the 1st cd and +so on. You can define a custom cd/dvd size with the size tag. + +After defining the volumes, you must supply the root of the Frugalware +Source Tree with the fst_root tag. Other optional tags include out_dir +[defaults to fst_root], version [timestamp] and codename [-current]. + +.SH HACKING + +Probably the most changing part is the initrd and the kernel. You can generate +them from the 'setup' darcs repo. + +.SH OPTIONS +.TP +.B -h|--help +Show the help screen. +.TP +.B -c +Do not generate the isos, just print out the number of required isos for the +given size. +.TP +.B +By default, mkiso searches for the file named "voluemes.xml". If you want a +different one, then just specify it. +.SH AUTHORS +Written by Miklos Vajna. +.SH "REPORTING BUGS" +Please report bugs to http://bugs.frugalware.org/. +.SH "SEE ALSO" +.BR darcs (1), +.BR pacman (8) } From vmiklos at frugalware.org Sat Jun 3 02:21:25 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 02:21:27 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: create /tmp under tmproot Message-ID: <20060603002125.1BA94FB4017@genesis.frugalware.org> [mkiso: create /tmp under tmproot VMiklos **20060603001407 required by the new pacman ;-) ] { hunk ./mkiso/mkiso.c 421 + char *ptr; hunk ./mkiso/mkiso.c 445 + ptr = g_strdup_printf("%s/tmp", tmproot); + mkdir(ptr, 0700); + free(ptr); } From vmiklos at frugalware.org Sat Jun 3 02:21:25 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 02:21:28 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: avoid the implicit declaration of mkdir() Message-ID: <20060603002125.78D53FB4019@genesis.frugalware.org> [mkiso: avoid the implicit declaration of mkdir() VMiklos **20060603001521] { hunk ./mkiso/mkiso.c 29 +#include } From vmiklos at frugalware.org Sat Jun 3 02:39:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 02:39:44 2006 Subject: [Frugalware-darcs] frugalware-current: totem-1.4.1-3-i686 Message-ID: <20060603003942.7A518FB4017@genesis.frugalware.org> [totem-1.4.1-3-i686 VMiklos **20060603003552 depends() fix (totem-nsplugin: requires firefox=1.5.0.3) ] { hunk ./source/gnome/totem/FrugalBuild 1 -# Last modified: Fri, 02 Jun 2006 03:22:45 +0200 +# Last modified: Sat, 03 Jun 2006 02:33:54 +0200 hunk ./source/gnome/totem/FrugalBuild 8 -pkgrel=2 +firefoxver=1.5.0.4 +pkgrel=3 hunk ./source/gnome/totem/FrugalBuild 16 -makedepends=('intltool' 'firefox=1.5.0.4' 'pango' 'gnome-icon-theme' 'nautilus') +makedepends=('intltool' "firefox=$firefoxver" 'pango' 'gnome-icon-theme' 'nautilus') hunk ./source/gnome/totem/FrugalBuild 25 -subdepends=("firefox=1.5.0.3 $pkgname=$pkgver" "nautilus $pkgname=$pkgver") +subdepends=("firefox=$firefoxver $pkgname=$pkgver" "nautilus $pkgname=$pkgver") } From vmiklos at frugalware.org Sat Jun 3 03:01:21 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 03:01:23 2006 Subject: [Frugalware-darcs] frugalware-current: epiphany-extensions-2.14.1.1-2-i686 Message-ID: <20060603010121.601E3FB4017@genesis.frugalware.org> [epiphany-extensions-2.14.1.1-2-i686 VMiklos **20060603005921 rebuilt with epiphany=2.14.2.1 ] { hunk ./extra/source/gnome/epiphany-extensions/FrugalBuild 1 -# Last Modified: Tue, 23 May 2006 02:12:31 +0200 +# Last Modified: Sat, 03 Jun 2006 02:54:29 +0200 hunk ./extra/source/gnome/epiphany-extensions/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./extra/source/gnome/epiphany-extensions/FrugalBuild 10 -depends=('opensp' 'nss' 'pcre' 'epiphany=2.14.1.1' 'gnome-doc-utils') +depends=('opensp' 'nss' 'pcre' 'epiphany=2.14.2.1' 'gnome-doc-utils') } From vmiklos at frugalware.org Sat Jun 3 03:04:53 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 03:04:55 2006 Subject: [Frugalware-darcs] pacman-tools: repoman: small speedup hack Message-ID: <20060603010453.9BAF8FB4017@genesis.frugalware.org> [repoman: small speedup hack VMiklos **20060603010132] { hunk ./repoman 59 - # ok, this is a bit slow, but anyone knows a better sollution? ;-) - group=`tar xOjf $1 .PKGINFO 2>&1|grep ^group|sed 's/.* = \(.*\)/\1/;q'` + group=`LANG= LC_ALL= pacman -Qi -p $1 |grep ^Group|sed 's/.* : \([^ ]*\) .*/\1/'` } From vmiklos at frugalware.org Sat Jun 3 03:59:35 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 03:59:39 2006 Subject: [Frugalware-darcs] pacman: libalpm/hu.po: update Message-ID: <20060603015935.E010FFB4017@genesis.frugalware.org> [libalpm/hu.po: update VMiklos **20060603015514] { hunk ./lib/libalpm/po/hu.po 1 +# translation of hu.po to Hungarian hunk ./lib/libalpm/po/hu.po 5 -# Miklos Vajna , 2006. hunk ./lib/libalpm/po/hu.po 6 +# Miklos Vajna , 2006. hunk ./lib/libalpm/po/hu.po 9 -"Project-Id-Version: libalpm 0.1.0\n" +"Project-Id-Version: hu\n" hunk ./lib/libalpm/po/hu.po 12 -"PO-Revision-Date: 2006-05-09 16:36+0200\n" -"Last-Translator: \n" +"PO-Revision-Date: 2006-06-03 03:54+0200\n" +"Last-Translator: Miklos Vajna \n" hunk ./lib/libalpm/po/hu.po 19 +"X-Generator: KBabel 1.11.2\n" hunk ./lib/libalpm/po/hu.po 429 -msgstr "" +msgstr "checkconflicts: cél '%s' vs db" hunk ./lib/libalpm/po/hu.po 442 -msgstr "" +msgstr "checkconflicts: cél '%s' vs célok" hunk ./lib/libalpm/po/hu.po 454 -msgstr "" +msgstr "checkconflicts: db vs cél '%s'" hunk ./lib/libalpm/po/hu.po 474 -#, fuzzy hunk ./lib/libalpm/po/hu.po 475 -msgstr "rendezés függőségek szerint" +msgstr "a függőségek rendezése elkezdődött" hunk ./lib/libalpm/po/hu.po 482 -#, fuzzy hunk ./lib/libalpm/po/hu.po 483 -msgstr "rendezés függőségek szerint" +msgstr "a függőségek rendezése befejeződött" hunk ./lib/libalpm/po/hu.po 502 -msgstr "" +msgstr "a dep NULL!" hunk ./lib/libalpm/po/hu.po 527 -msgid "" -"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" +msgid "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" hunk ./lib/libalpm/po/hu.po 1052 -msgstr "" -"nem sikerült md5 vagy sha1 ellenőrző-összeget kapni a '%s' csomag számára\n" +msgstr "nem sikerült md5 vagy sha1 ellenőrző-összeget kapni a '%s' csomag számára\n" hunk ./lib/libalpm/po/hu.po 1106 -#, fuzzy hunk ./lib/libalpm/po/hu.po 1107 -msgstr "a lecserélt csomagok függőségeinek adatbázisának frissítése" +msgstr "az adatbázis frissítése a lecserélt csomagok függőségei miatt" hunk ./lib/libalpm/po/hu.po 1173 + } From vmiklos at frugalware.org Sat Jun 3 03:59:36 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 03:59:41 2006 Subject: [Frugalware-darcs] pacman: pacman/hu.po: update Message-ID: <20060603015936.30740FB401A@genesis.frugalware.org> [pacman/hu.po: update VMiklos **20060603015200] { hunk ./src/pacman/po/hu.po 1 +# translation of hu.po to Hungarian hunk ./src/pacman/po/hu.po 5 -# Miklos Vajna , 2006. hunk ./src/pacman/po/hu.po 6 +# Miklos Vajna , 2006. hunk ./src/pacman/po/hu.po 9 -"Project-Id-Version: pacman 2.9.99\n" +"Project-Id-Version: hu\n" hunk ./src/pacman/po/hu.po 12 -"PO-Revision-Date: 2006-05-10 20:26+0200\n" -"Last-Translator: \n" +"PO-Revision-Date: 2006-06-03 03:50+0200\n" +"Last-Translator: Miklos Vajna \n" hunk ./src/pacman/po/hu.po 19 +"X-Generator: KBabel 1.11.2\n" hunk ./src/pacman/po/hu.po 99 -msgid "" -"config: line %d: '%s' is reserved and cannot be used as a package tree\n" +msgid "config: line %d: '%s' is reserved and cannot be used as a package tree\n" hunk ./src/pacman/po/hu.po 112 -msgstr "" -"beállítások: %d. sor: minden direktívának egy szekcióhoz kell tartoznia\n" +msgstr "beállítások: %d. sor: minden direktívának egy szekcióhoz kell tartoznia\n" hunk ./src/pacman/po/hu.po 593 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 595 -msgstr "Méret (tömörített): %ld\n" +msgstr "Méret (tömörítetlen): %ld\n" hunk ./src/pacman/po/hu.po 693 -msgstr "" -" -f, --force a telepítés eröltetése, ütköző fájlok felülírása\n" +msgstr " -f, --force a telepítés eröltetése, ütköző fájlok felülírása\n" hunk ./src/pacman/po/hu.po 702 -msgid "" -" -c, --cascade remove packages and all packages that depend on them\n" -msgstr "" -" -c, --cascade a csomagok és az őket igénylő csomagok eltávolítása\n" +msgid " -c, --cascade remove packages and all packages that depend on them\n" +msgstr " -c, --cascade a csomagok és az őket igénylő csomagok eltávolítása\n" hunk ./src/pacman/po/hu.po 719 -msgid "" -" -s, --recursive remove dependencies also (that won't break packages)\n" +msgid " -s, --recursive remove dependencies also (that won't break packages)\n" hunk ./src/pacman/po/hu.po 746 -msgid "" -" -e, --orphans list all packages that were installed as a dependency\n" +msgid " -e, --orphans list all packages that were installed as a dependency\n" hunk ./src/pacman/po/hu.po 790 -msgstr "" -" -p, --file a pacman a [csomag] csomagfájlt kérdezze le ahelyett,\n" +msgstr " -p, --file a pacman a [csomag] csomagfájlt kérdezze le ahelyett,\n" hunk ./src/pacman/po/hu.po 828 -msgstr "" -" -p, --print-uris kinyomtatja az adott csomagok es függőségeik URI-it\n" +msgstr " -p, --print-uris kinyomtatja az adott csomagok es függőségeik URI-it\n" hunk ./src/pacman/po/hu.po 842 -msgid "" -" -w, --downloadonly download packages but do not install/upgrade anything\n" +msgid " -w, --downloadonly download packages but do not install/upgrade anything\n" hunk ./src/pacman/po/hu.po 847 -msgid "" -" -y, --refresh download fresh package databases from the server\n" +msgid " -y, --refresh download fresh package databases from the server\n" hunk ./src/pacman/po/hu.po 852 -msgid "" -" --ignore ignore a package upgrade (can be used more than once)\n" +msgid " --ignore ignore a package upgrade (can be used more than once)\n" hunk ./src/pacman/po/hu.po 869 -msgid "" -" --noprogressbar do not show a progress bar when downloading files\n" -msgstr "" -" --noprogressbar ne mutasson folyamatsávot a fájlok letöltése közben\n" +msgid " --noprogressbar do not show a progress bar when downloading files\n" +msgstr " --noprogressbar ne mutasson folyamatsávot a fájlok letöltése közben\n" hunk ./src/pacman/po/hu.po 874 -msgid "" -" --noscriptlet do not execute the install scriptlet if there is any\n" -msgstr "" -" --noscriptlet ne futtassa le a telepítési szkriptet ha van olyan\n" +msgid " --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr " --noscriptlet ne futtassa le a telepítési szkriptet ha van olyan\n" hunk ./src/pacman/po/hu.po 885 -msgstr "" -" -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n" +msgstr " -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n" hunk ./src/pacman/po/hu.po 895 -msgstr "" -" Ezt a programot bárki a General Public License-ben\n" +msgstr " Ezt a programot bárki a General Public License-ben\n" hunk ./src/pacman/po/hu.po 1170 -msgstr "" -"nem sikerült hozzáadni a '%s' célt: nem található a távoli adatbázisban\n" +msgstr "nem sikerült hozzáadni a '%s' célt: nem található a távoli adatbázisban\n" hunk ./src/pacman/po/hu.po 1206 -#, fuzzy, c-format +#, c-format hunk ./src/pacman/po/hu.po 1212 -"Teljes csomagméret: %.1f MB\n" +"Teljes tömörítetlen csomagméret: %.1f MB\n" hunk ./src/pacman/po/hu.po 1267 -#, fuzzy hunk ./src/pacman/po/hu.po 1268 -msgstr "nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp használata" +msgstr "nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp használata\n" hunk ./src/pacman/po/hu.po 1334 -msgstr "" -":: a %s igényli a %s-t, de az az IgnorePkg része. Mégis telepíti? [I/n] " +msgstr ":: a %s igényli a %s-t, de az az IgnorePkg része. Mégis telepíti? [I/n] " hunk ./src/pacman/po/hu.po 1379 + } From vmiklos at frugalware.org Sat Jun 3 03:59:36 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 03:59:42 2006 Subject: [Frugalware-darcs] pacman: full uncompressed package size support Message-ID: <20060603015936.D16F8FB401E@genesis.frugalware.org> [full uncompressed package size support VMiklos **20060603014224] { hunk ./lib/libalpm/alpm.c 443 + case PM_PKG_USIZE: hunk ./lib/libalpm/alpm.c 493 + case PM_PKG_USIZE: data = (void *)pkg->usize; break; hunk ./lib/libalpm/alpm.h 143 + PM_PKG_USIZE, hunk ./lib/libalpm/be_files.c 239 + } else if(!strcmp(line, "%USIZE%")) { + /* USIZE (uncompressed size) tag only appears in sync repositories, + * not the local one. */ + char tmp[32]; + if(fgets(tmp, sizeof(tmp), fp) == NULL) { + goto error; + } + _alpm_strtrim(tmp); + info->usize = atol(tmp); hunk ./lib/libalpm/be_files.c 452 + if(info->usize) { + fprintf(fp, "%%USIZE%%\n" + "%ld\n\n", info->usize); + } hunk ./lib/libalpm/package.c 65 + pkg->usize = 0; hunk ./lib/libalpm/package.c 107 + newpkg->usize = pkg->usize; hunk ./lib/libalpm/package.c 223 + } else if(!strcmp(key, "USIZE")) { + char tmp[32]; + STRNCPY(tmp, ptr, sizeof(tmp)); + info->usize = atol(tmp); hunk ./lib/libalpm/package.h 57 + unsigned long usize; hunk ./src/pacman/package.c 149 + printf(_("Size (uncompressed):%ld\n"), (long)alpm_pkg_getinfo(pkg, PM_PKG_USIZE)); hunk ./src/pacman/sync.c 593 - double mb; + unsigned long totalusize = 0; + double mb, umb; hunk ./src/pacman/sync.c 616 + totalusize += (int)alpm_pkg_getinfo(pkg, PM_PKG_USIZE); hunk ./src/pacman/sync.c 630 + umb = (double)(totalusize / 1048576.0); hunk ./src/pacman/sync.c 635 + if(umb < 0.1) { + umb = 0.1; + } hunk ./src/pacman/sync.c 642 + MSG(NL, _("\nTotal Uncompressed Package Size: %.1f MB\n"), umb); } From vmiklos at frugalware.org Sat Jun 3 03:59:36 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 03:59:46 2006 Subject: [Frugalware-darcs] pacman: pot/po update Message-ID: <20060603015936.8E862FB401B@genesis.frugalware.org> [pot/po update VMiklos **20060603014650] { hunk ./lib/libalpm/po/de.po 10 -"POT-Creation-Date: 2006-05-04 17:09+0200\n" +"POT-Creation-Date: 2006-06-03 03:45+0200\n" hunk ./lib/libalpm/po/de.po 72 -#: ../add.c:335 ../alpm.c:467 ../conflict.c:271 ../conflict.c:301 +#: ../add.c:335 ../alpm.c:468 ../conflict.c:271 ../conflict.c:301 hunk ./lib/libalpm/po/de.po 77 -#: ../add.c:345 ../alpm.c:447 ../alpm.c:577 ../alpm.c:625 +#: ../add.c:345 ../alpm.c:448 ../alpm.c:579 ../alpm.c:627 hunk ./lib/libalpm/po/de.po 180 -msgstr "Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew" +msgstr "" +"Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew" hunk ./lib/libalpm/po/de.po 304 -msgstr "Datenbankverzeichnis '%s' ist nicht vorhanden - Versuche es zu erstellen" +msgstr "" +"Datenbankverzeichnis '%s' ist nicht vorhanden - Versuche es zu erstellen" hunk ./lib/libalpm/po/de.po 338 -#: ../alpm.c:474 +#: ../alpm.c:475 hunk ./lib/libalpm/po/de.po 343 -#: ../alpm.c:571 +#: ../alpm.c:573 hunk ./lib/libalpm/po/de.po 348 -#: ../alpm.c:582 ../alpm.c:630 +#: ../alpm.c:584 ../alpm.c:632 hunk ./lib/libalpm/po/de.po 353 -#: ../alpm.c:585 +#: ../alpm.c:587 hunk ./lib/libalpm/po/de.po 358 -#: ../alpm.c:619 +#: ../alpm.c:621 hunk ./lib/libalpm/po/de.po 363 -#: ../alpm.c:633 +#: ../alpm.c:635 hunk ./lib/libalpm/po/de.po 368 -#: ../alpm.c:879 +#: ../alpm.c:886 hunk ./lib/libalpm/po/de.po 373 -#: ../alpm.c:880 +#: ../alpm.c:887 hunk ./lib/libalpm/po/de.po 383 -#: ../be_files.c:385 +#: ../be_files.c:394 hunk ./lib/libalpm/po/de.po 388 -#: ../be_files.c:459 +#: ../be_files.c:472 hunk ./lib/libalpm/po/de.po 393 -#: ../be_files.c:485 +#: ../be_files.c:498 hunk ./lib/libalpm/po/de.po 459 -#: ../conflict.c:231 ../conflict.c:333 ../deps.c:48 ../deps.c:595 -#: ../deps.c:635 ../group.c:40 ../handle.c:50 ../package.c:91 ../sync.c:60 +#: ../conflict.c:231 ../conflict.c:333 ../deps.c:49 ../deps.c:596 +#: ../deps.c:636 ../group.c:40 ../handle.c:50 ../package.c:92 ../sync.c:60 hunk ./lib/libalpm/po/de.po 471 -#: ../deps.c:116 +#: ../deps.c:113 +#, fuzzy +msgid "started sorting dependencies" +msgstr "Sortiere nach Abhängigkeiten" + +#: ../deps.c:118 hunk ./lib/libalpm/po/de.po 480 -#: ../deps.c:254 ../deps.c:400 +#: ../deps.c:161 +#, fuzzy +msgid "sorting dependencies finished" +msgstr "Sortiere nach Abhängigkeiten" + +#: ../deps.c:255 ../deps.c:401 hunk ./lib/libalpm/po/de.po 490 -#: ../deps.c:364 +#: ../deps.c:365 hunk ./lib/libalpm/po/de.po 495 -#: ../deps.c:488 +#: ../deps.c:489 hunk ./lib/libalpm/po/de.po 500 -#: ../deps.c:493 +#: ../deps.c:494 hunk ./lib/libalpm/po/de.po 504 -#: ../deps.c:505 +#: ../deps.c:506 hunk ./lib/libalpm/po/de.po 510 -#: ../deps.c:522 +#: ../deps.c:523 hunk ./lib/libalpm/po/de.po 515 -#: ../deps.c:525 +#: ../deps.c:526 hunk ./lib/libalpm/po/de.po 520 -#: ../deps.c:567 +#: ../deps.c:568 hunk ./lib/libalpm/po/de.po 525 -#: ../deps.c:591 +#: ../deps.c:592 hunk ./lib/libalpm/po/de.po 530 -"Kann Abhängigkeiten fĂźr \"%s\" nicht auflĂśsen (\"%s\" ist nicht in Paketliste enthalten)" +"Kann Abhängigkeiten fĂźr \"%s\" nicht auflĂśsen (\"%s\" ist nicht in " +"Paketliste enthalten)" hunk ./lib/libalpm/po/de.po 534 -#: ../deps.c:608 +#: ../deps.c:609 hunk ./lib/libalpm/po/de.po 539 -#: ../deps.c:628 +#: ../deps.c:629 hunk ./lib/libalpm/po/de.po 544 -#: ../deps.c:632 +#: ../deps.c:633 hunk ./lib/libalpm/po/de.po 550 -#: ../deps.c:648 +#: ../deps.c:649 hunk ./lib/libalpm/po/de.po 765 -#: ../package.c:174 +#: ../package.c:176 hunk ./lib/libalpm/po/de.po 770 -#: ../package.c:191 ../package.c:234 +#: ../package.c:193 ../package.c:240 hunk ./lib/libalpm/po/de.po 775 -#: ../package.c:291 +#: ../package.c:297 hunk ./lib/libalpm/po/de.po 779 -#: ../package.c:299 +#: ../package.c:305 hunk ./lib/libalpm/po/de.po 784 -#: ../package.c:307 +#: ../package.c:313 hunk ./lib/libalpm/po/de.po 789 -#: ../package.c:346 +#: ../package.c:352 hunk ./lib/libalpm/po/de.po 794 -#: ../package.c:363 +#: ../package.c:369 hunk ./lib/libalpm/po/de.po 799 -#: ../package.c:371 +#: ../package.c:377 hunk ./lib/libalpm/po/de.po 1107 -msgid "updating database for replaced packages dependencies" +#, fuzzy +msgid "updating database for replaced packages' dependencies" hunk ./lib/libalpm/po/hu.po 10 -"POT-Creation-Date: 2006-05-04 17:09+0200\n" +"POT-Creation-Date: 2006-06-03 03:45+0200\n" hunk ./lib/libalpm/po/hu.po 72 -#: ../add.c:335 ../alpm.c:467 ../conflict.c:271 ../conflict.c:301 +#: ../add.c:335 ../alpm.c:468 ../conflict.c:271 ../conflict.c:301 hunk ./lib/libalpm/po/hu.po 77 -#: ../add.c:345 ../alpm.c:447 ../alpm.c:577 ../alpm.c:625 +#: ../add.c:345 ../alpm.c:448 ../alpm.c:579 ../alpm.c:627 hunk ./lib/libalpm/po/hu.po 180 -msgstr "folyamat: a jelenlegi fájl megtartása és az új .pacnew végződéssel való telepítése" +msgstr "" +"folyamat: a jelenlegi fájl megtartása és az új .pacnew végződéssel való " +"telepítése" hunk ./lib/libalpm/po/hu.po 338 -#: ../alpm.c:474 +#: ../alpm.c:475 hunk ./lib/libalpm/po/hu.po 343 -#: ../alpm.c:571 +#: ../alpm.c:573 hunk ./lib/libalpm/po/hu.po 348 -#: ../alpm.c:582 ../alpm.c:630 +#: ../alpm.c:584 ../alpm.c:632 hunk ./lib/libalpm/po/hu.po 353 -#: ../alpm.c:585 +#: ../alpm.c:587 hunk ./lib/libalpm/po/hu.po 358 -#: ../alpm.c:619 +#: ../alpm.c:621 hunk ./lib/libalpm/po/hu.po 363 -#: ../alpm.c:633 +#: ../alpm.c:635 hunk ./lib/libalpm/po/hu.po 368 -#: ../alpm.c:879 +#: ../alpm.c:886 hunk ./lib/libalpm/po/hu.po 373 -#: ../alpm.c:880 +#: ../alpm.c:887 hunk ./lib/libalpm/po/hu.po 383 -#: ../be_files.c:385 +#: ../be_files.c:394 hunk ./lib/libalpm/po/hu.po 388 -#: ../be_files.c:459 +#: ../be_files.c:472 hunk ./lib/libalpm/po/hu.po 393 -#: ../be_files.c:485 +#: ../be_files.c:498 hunk ./lib/libalpm/po/hu.po 459 -#: ../conflict.c:231 ../conflict.c:333 ../deps.c:48 ../deps.c:595 -#: ../deps.c:635 ../group.c:40 ../handle.c:50 ../package.c:91 ../sync.c:60 +#: ../conflict.c:231 ../conflict.c:333 ../deps.c:49 ../deps.c:596 +#: ../deps.c:636 ../group.c:40 ../handle.c:50 ../package.c:92 ../sync.c:60 hunk ./lib/libalpm/po/hu.po 471 -#: ../deps.c:116 +#: ../deps.c:113 +#, fuzzy +msgid "started sorting dependencies" +msgstr "rendezés függőségek szerint" + +#: ../deps.c:118 hunk ./lib/libalpm/po/hu.po 480 -#: ../deps.c:254 ../deps.c:400 +#: ../deps.c:161 +#, fuzzy +msgid "sorting dependencies finished" +msgstr "rendezés függőségek szerint" + +#: ../deps.c:255 ../deps.c:401 hunk ./lib/libalpm/po/hu.po 490 -#: ../deps.c:364 +#: ../deps.c:365 hunk ./lib/libalpm/po/hu.po 495 -#: ../deps.c:488 +#: ../deps.c:489 hunk ./lib/libalpm/po/hu.po 500 -#: ../deps.c:493 +#: ../deps.c:494 hunk ./lib/libalpm/po/hu.po 504 -#: ../deps.c:505 +#: ../deps.c:506 hunk ./lib/libalpm/po/hu.po 510 -#: ../deps.c:522 +#: ../deps.c:523 hunk ./lib/libalpm/po/hu.po 515 -#: ../deps.c:525 +#: ../deps.c:526 hunk ./lib/libalpm/po/hu.po 520 -#: ../deps.c:567 +#: ../deps.c:568 hunk ./lib/libalpm/po/hu.po 525 -#: ../deps.c:591 +#: ../deps.c:592 hunk ./lib/libalpm/po/hu.po 530 -"nem sikerült a függőségek feloldása a \"%s\" számára (nem található a \"%s\" a csomagok között)" +"nem sikerült a függőségek feloldása a \"%s\" számára (nem található a \"%s\" " +"a csomagok között)" hunk ./lib/libalpm/po/hu.po 534 -#: ../deps.c:608 +#: ../deps.c:609 hunk ./lib/libalpm/po/hu.po 539 -#: ../deps.c:628 +#: ../deps.c:629 hunk ./lib/libalpm/po/hu.po 544 -#: ../deps.c:632 +#: ../deps.c:633 hunk ./lib/libalpm/po/hu.po 550 -#: ../deps.c:648 +#: ../deps.c:649 hunk ./lib/libalpm/po/hu.po 765 -#: ../package.c:174 +#: ../package.c:176 hunk ./lib/libalpm/po/hu.po 770 -#: ../package.c:191 ../package.c:234 +#: ../package.c:193 ../package.c:240 hunk ./lib/libalpm/po/hu.po 775 -#: ../package.c:291 +#: ../package.c:297 hunk ./lib/libalpm/po/hu.po 779 -#: ../package.c:299 +#: ../package.c:305 hunk ./lib/libalpm/po/hu.po 784 -#: ../package.c:307 +#: ../package.c:313 hunk ./lib/libalpm/po/hu.po 789 -#: ../package.c:346 +#: ../package.c:352 hunk ./lib/libalpm/po/hu.po 794 -#: ../package.c:363 +#: ../package.c:369 hunk ./lib/libalpm/po/hu.po 799 -#: ../package.c:371 +#: ../package.c:377 hunk ./lib/libalpm/po/hu.po 1053 -msgstr "nem sikerült md5 vagy sha1 ellenőrző-összeget kapni a '%s' csomag számára\n" +msgstr "" +"nem sikerült md5 vagy sha1 ellenőrző-összeget kapni a '%s' csomag számára\n" hunk ./lib/libalpm/po/hu.po 1108 -msgid "updating database for replaced packages dependencies" +#, fuzzy +msgid "updating database for replaced packages' dependencies" hunk ./lib/libalpm/po/libalpm.pot 11 -"POT-Creation-Date: 2006-05-04 17:09+0200\n" +"POT-Creation-Date: 2006-06-03 03:45+0200\n" hunk ./lib/libalpm/po/libalpm.pot 72 -#: ../add.c:335 ../alpm.c:467 ../conflict.c:271 ../conflict.c:301 +#: ../add.c:335 ../alpm.c:468 ../conflict.c:271 ../conflict.c:301 hunk ./lib/libalpm/po/libalpm.pot 77 -#: ../add.c:345 ../alpm.c:447 ../alpm.c:577 ../alpm.c:625 +#: ../add.c:345 ../alpm.c:448 ../alpm.c:579 ../alpm.c:627 hunk ./lib/libalpm/po/libalpm.pot 336 -#: ../alpm.c:474 +#: ../alpm.c:475 hunk ./lib/libalpm/po/libalpm.pot 341 -#: ../alpm.c:571 +#: ../alpm.c:573 hunk ./lib/libalpm/po/libalpm.pot 346 -#: ../alpm.c:582 ../alpm.c:630 +#: ../alpm.c:584 ../alpm.c:632 hunk ./lib/libalpm/po/libalpm.pot 351 -#: ../alpm.c:585 +#: ../alpm.c:587 hunk ./lib/libalpm/po/libalpm.pot 356 -#: ../alpm.c:619 +#: ../alpm.c:621 hunk ./lib/libalpm/po/libalpm.pot 361 -#: ../alpm.c:633 +#: ../alpm.c:635 hunk ./lib/libalpm/po/libalpm.pot 366 -#: ../alpm.c:879 +#: ../alpm.c:886 hunk ./lib/libalpm/po/libalpm.pot 371 -#: ../alpm.c:880 +#: ../alpm.c:887 hunk ./lib/libalpm/po/libalpm.pot 381 -#: ../be_files.c:385 +#: ../be_files.c:394 hunk ./lib/libalpm/po/libalpm.pot 386 -#: ../be_files.c:459 +#: ../be_files.c:472 hunk ./lib/libalpm/po/libalpm.pot 391 -#: ../be_files.c:485 +#: ../be_files.c:498 hunk ./lib/libalpm/po/libalpm.pot 457 -#: ../conflict.c:231 ../conflict.c:333 ../deps.c:48 ../deps.c:595 -#: ../deps.c:635 ../group.c:40 ../handle.c:50 ../package.c:91 ../sync.c:60 +#: ../conflict.c:231 ../conflict.c:333 ../deps.c:49 ../deps.c:596 +#: ../deps.c:636 ../group.c:40 ../handle.c:50 ../package.c:92 ../sync.c:60 hunk ./lib/libalpm/po/libalpm.pot 469 -#: ../deps.c:116 +#: ../deps.c:113 +msgid "started sorting dependencies" +msgstr "" + +#: ../deps.c:118 hunk ./lib/libalpm/po/libalpm.pot 477 -#: ../deps.c:254 ../deps.c:400 +#: ../deps.c:161 +msgid "sorting dependencies finished" +msgstr "" + +#: ../deps.c:255 ../deps.c:401 hunk ./lib/libalpm/po/libalpm.pot 486 -#: ../deps.c:364 +#: ../deps.c:365 hunk ./lib/libalpm/po/libalpm.pot 491 -#: ../deps.c:488 +#: ../deps.c:489 hunk ./lib/libalpm/po/libalpm.pot 496 -#: ../deps.c:493 +#: ../deps.c:494 hunk ./lib/libalpm/po/libalpm.pot 500 -#: ../deps.c:505 +#: ../deps.c:506 hunk ./lib/libalpm/po/libalpm.pot 506 -#: ../deps.c:522 +#: ../deps.c:523 hunk ./lib/libalpm/po/libalpm.pot 511 -#: ../deps.c:525 +#: ../deps.c:526 hunk ./lib/libalpm/po/libalpm.pot 516 -#: ../deps.c:567 +#: ../deps.c:568 hunk ./lib/libalpm/po/libalpm.pot 521 -#: ../deps.c:591 +#: ../deps.c:592 hunk ./lib/libalpm/po/libalpm.pot 528 -#: ../deps.c:608 +#: ../deps.c:609 hunk ./lib/libalpm/po/libalpm.pot 533 -#: ../deps.c:628 +#: ../deps.c:629 hunk ./lib/libalpm/po/libalpm.pot 538 -#: ../deps.c:632 +#: ../deps.c:633 hunk ./lib/libalpm/po/libalpm.pot 544 -#: ../deps.c:648 +#: ../deps.c:649 hunk ./lib/libalpm/po/libalpm.pot 759 -#: ../package.c:174 +#: ../package.c:176 hunk ./lib/libalpm/po/libalpm.pot 764 -#: ../package.c:191 ../package.c:234 +#: ../package.c:193 ../package.c:240 hunk ./lib/libalpm/po/libalpm.pot 769 -#: ../package.c:291 +#: ../package.c:297 hunk ./lib/libalpm/po/libalpm.pot 773 -#: ../package.c:299 +#: ../package.c:305 hunk ./lib/libalpm/po/libalpm.pot 778 -#: ../package.c:307 +#: ../package.c:313 hunk ./lib/libalpm/po/libalpm.pot 783 -#: ../package.c:346 +#: ../package.c:352 hunk ./lib/libalpm/po/libalpm.pot 788 -#: ../package.c:363 +#: ../package.c:369 hunk ./lib/libalpm/po/libalpm.pot 793 -#: ../package.c:371 +#: ../package.c:377 hunk ./lib/libalpm/po/libalpm.pot 1101 -msgid "updating database for replaced packages dependencies" +msgid "updating database for replaced packages' dependencies" hunk ./src/pacman/po/de.po 10 -"POT-Creation-Date: 2006-05-06 17:24+0200\n" +"POT-Creation-Date: 2006-06-03 03:44+0200\n" hunk ./src/pacman/po/de.po 42 -#: ../add.c:91 ../remove.c:109 ../sync.c:546 +#: ../add.c:91 ../remove.c:109 ../sync.c:548 hunk ./src/pacman/po/de.po 52 -#: ../add.c:110 ../sync.c:567 +#: ../add.c:110 ../sync.c:569 hunk ./src/pacman/po/de.po 57 -#: ../add.c:120 ../sync.c:753 +#: ../add.c:120 ../sync.c:762 hunk ./src/pacman/po/de.po 62 -#: ../add.c:127 ../sync.c:760 +#: ../add.c:127 ../sync.c:769 hunk ./src/pacman/po/de.po 67 -#: ../add.c:135 ../sync.c:768 ../sync.c:775 +#: ../add.c:135 ../sync.c:777 ../sync.c:784 hunk ./src/pacman/po/de.po 75 -#: ../add.c:147 ../remove.c:149 ../sync.c:746 +#: ../add.c:147 ../remove.c:149 ../sync.c:755 hunk ./src/pacman/po/de.po 80 -#: ../add.c:154 ../remove.c:159 ../sync.c:454 ../sync.c:795 +#: ../add.c:154 ../remove.c:159 ../sync.c:454 ../sync.c:804 hunk ./src/pacman/po/de.po 152 -#: ../conf.c:209 ../conf.c:217 ../pacman.c:535 +#: ../conf.c:209 ../conf.c:217 ../pacman.c:546 hunk ./src/pacman/po/de.po 390 -#: ../log.c:51 +#: ../log.c:55 hunk ./src/pacman/po/de.po 395 -#: ../log.c:54 +#: ../log.c:58 hunk ./src/pacman/po/de.po 400 -#: ../log.c:57 +#: ../log.c:61 hunk ./src/pacman/po/de.po 405 -#: ../log.c:60 +#: ../log.c:64 hunk ./src/pacman/po/de.po 410 -#: ../log.c:63 +#: ../log.c:67 hunk ./src/pacman/po/de.po 415 -#: ../log.c:66 +#: ../log.c:70 hunk ./src/pacman/po/de.po 420 -#: ../log.c:152 +#: ../log.c:154 hunk ./src/pacman/po/de.po 424 -#: ../log.c:152 +#: ../log.c:154 hunk ./src/pacman/po/de.po 593 +#, fuzzy, c-format +msgid "Size (uncompressed):%ld\n" +msgstr "Größe komprimiert : %ld\n" + +#: ../package.c:150 hunk ./src/pacman/po/de.po 602 -#: ../package.c:153 +#: ../package.c:154 hunk ./src/pacman/po/de.po 611 -#: ../package.c:157 +#: ../package.c:158 hunk ./src/pacman/po/de.po 620 -#: ../package.c:186 +#: ../package.c:187 hunk ./src/pacman/po/de.po 924 -#: ../pacman.c:356 +#: ../pacman.c:363 hunk ./src/pacman/po/de.po 928 -#: ../pacman.c:383 +#: ../pacman.c:390 hunk ./src/pacman/po/de.po 932 -#: ../pacman.c:475 +#: ../pacman.c:486 hunk ./src/pacman/po/de.po 934 -msgstr "" -"Sie benĂśtigen root Rechte um diese Operation ausfĂźhren zu kĂśnnen\n" - +msgstr "Sie benĂśtigen root Rechte um diese Operation ausfĂźhren zu kĂśnnen\n" hunk ./src/pacman/po/de.po 936 -#: ../pacman.c:499 +#: ../pacman.c:510 hunk ./src/pacman/po/de.po 941 -#: ../pacman.c:512 +#: ../pacman.c:523 hunk ./src/pacman/po/de.po 946 -#: ../pacman.c:516 +#: ../pacman.c:527 hunk ./src/pacman/po/de.po 951 -#: ../pacman.c:524 +#: ../pacman.c:535 hunk ./src/pacman/po/de.po 956 -#: ../pacman.c:529 ../sync.c:724 +#: ../pacman.c:540 ../sync.c:733 hunk ./src/pacman/po/de.po 961 -#: ../pacman.c:545 +#: ../pacman.c:554 hunk ./src/pacman/po/de.po 965 -#: ../pacman.c:551 +#: ../pacman.c:560 hunk ./src/pacman/po/de.po 970 -#: ../pacman.c:558 +#: ../pacman.c:567 hunk ./src/pacman/po/de.po 974 -#: ../pacman.c:571 +#: ../pacman.c:580 hunk ./src/pacman/po/de.po 1021 -#: ../remove.c:64 ../sync.c:498 +#: ../remove.c:64 ../sync.c:500 hunk ./src/pacman/po/de.po 1173 -#: ../sync.c:467 ../sync.c:487 +#: ../sync.c:467 ../sync.c:488 hunk ./src/pacman/po/de.po 1178 -#: ../sync.c:504 +#: ../sync.c:506 hunk ./src/pacman/po/de.po 1182 -#: ../sync.c:511 +#: ../sync.c:513 hunk ./src/pacman/po/de.po 1187 -#: ../sync.c:534 +#: ../sync.c:536 hunk ./src/pacman/po/de.po 1192 -#: ../sync.c:552 +#: ../sync.c:554 hunk ./src/pacman/po/de.po 1196 -#: ../sync.c:552 +#: ../sync.c:554 hunk ./src/pacman/po/de.po 1200 -#: ../sync.c:618 +#: ../sync.c:622 hunk ./src/pacman/po/de.po 1208 -#: ../sync.c:630 +#: ../sync.c:638 hunk ./src/pacman/po/de.po 1216 -#: ../sync.c:633 +#: ../sync.c:641 hunk ./src/pacman/po/de.po 1225 -#: ../sync.c:639 +#: ../sync.c:642 +#, fuzzy, c-format +msgid "" +"\n" +"Total Uncompressed Package Size: %.1f MB\n" +msgstr "" +"\n" +"Gesamtgröße: %.1f MB\n" + +#: ../sync.c:648 hunk ./src/pacman/po/de.po 1242 -#: ../sync.c:643 +#: ../sync.c:652 hunk ./src/pacman/po/de.po 1246 -#: ../sync.c:651 +#: ../sync.c:660 hunk ./src/pacman/po/de.po 1254 -#: ../sync.c:655 +#: ../sync.c:664 hunk ./src/pacman/po/de.po 1258 -#: ../sync.c:702 +#: ../sync.c:711 hunk ./src/pacman/po/de.po 1263 -#: ../sync.c:710 +#: ../sync.c:719 hunk ./src/pacman/po/de.po 1273 -#: ../sync.c:714 +#: ../sync.c:723 hunk ./src/pacman/po/de.po 1278 -#: ../sync.c:715 +#: ../sync.c:724 hunk ./src/pacman/po/de.po 1286 -#: ../sync.c:720 -msgid "couldn't create package cache, using /tmp instead" +#: ../sync.c:729 +#, fuzzy +msgid "couldn't create package cache, using /tmp instead\n" hunk ./src/pacman/po/de.po 1291 -#: ../sync.c:721 +#: ../sync.c:730 hunk ./src/pacman/po/de.po 1295 -#: ../sync.c:731 +#: ../sync.c:740 hunk ./src/pacman/po/de.po 1354 -":: %s ist in IgnorePkg, wird aber von %s benĂśtigt. Trotzdem installieren? [J/n] " +":: %s ist in IgnorePkg, wird aber von %s benĂśtigt. Trotzdem installieren? [J/" +"n] " hunk ./src/pacman/po/hu.po 10 -"POT-Creation-Date: 2006-05-06 17:24+0200\n" +"POT-Creation-Date: 2006-06-03 03:44+0200\n" hunk ./src/pacman/po/hu.po 42 -#: ../add.c:91 ../remove.c:109 ../sync.c:546 +#: ../add.c:91 ../remove.c:109 ../sync.c:548 hunk ./src/pacman/po/hu.po 52 -#: ../add.c:110 ../sync.c:567 +#: ../add.c:110 ../sync.c:569 hunk ./src/pacman/po/hu.po 57 -#: ../add.c:120 ../sync.c:753 +#: ../add.c:120 ../sync.c:762 hunk ./src/pacman/po/hu.po 62 -#: ../add.c:127 ../sync.c:760 +#: ../add.c:127 ../sync.c:769 hunk ./src/pacman/po/hu.po 67 -#: ../add.c:135 ../sync.c:768 ../sync.c:775 +#: ../add.c:135 ../sync.c:777 ../sync.c:784 hunk ./src/pacman/po/hu.po 75 -#: ../add.c:147 ../remove.c:149 ../sync.c:746 +#: ../add.c:147 ../remove.c:149 ../sync.c:755 hunk ./src/pacman/po/hu.po 80 -#: ../add.c:154 ../remove.c:159 ../sync.c:454 ../sync.c:795 +#: ../add.c:154 ../remove.c:159 ../sync.c:454 ../sync.c:804 hunk ./src/pacman/po/hu.po 100 -"beállítások: %d. sor: a '%s' név fenntartott és nem használható csomagfa névként\n" +"beállítások: %d. sor: a '%s' név fenntartott és nem használható csomagfa " +"névként\n" hunk ./src/pacman/po/hu.po 111 -msgstr "beállítások: %d. sor: minden direktívának egy szekcióhoz kell tartoznia\n" +msgstr "" +"beállítások: %d. sor: minden direktívának egy szekcióhoz kell tartoznia\n" hunk ./src/pacman/po/hu.po 152 -#: ../conf.c:209 ../conf.c:217 ../pacman.c:535 +#: ../conf.c:209 ../conf.c:217 ../pacman.c:546 hunk ./src/pacman/po/hu.po 211 -"Frissítse kézzel ezeket a csomagokat vagy használjon egy kisebb értéket, hogy elkerülje ezt a problémát.\n" +"Frissítse kézzel ezeket a csomagokat vagy használjon egy kisebb értéket, " +"hogy elkerülje ezt a problémát.\n" hunk ./src/pacman/po/hu.po 390 -#: ../log.c:51 +#: ../log.c:55 hunk ./src/pacman/po/hu.po 395 -#: ../log.c:54 +#: ../log.c:58 hunk ./src/pacman/po/hu.po 400 -#: ../log.c:57 +#: ../log.c:61 hunk ./src/pacman/po/hu.po 405 -#: ../log.c:60 +#: ../log.c:64 hunk ./src/pacman/po/hu.po 410 -#: ../log.c:63 +#: ../log.c:67 hunk ./src/pacman/po/hu.po 415 -#: ../log.c:66 +#: ../log.c:70 hunk ./src/pacman/po/hu.po 420 -#: ../log.c:152 +#: ../log.c:154 hunk ./src/pacman/po/hu.po 424 -#: ../log.c:152 +#: ../log.c:154 hunk ./src/pacman/po/hu.po 593 +#, fuzzy, c-format +msgid "Size (uncompressed):%ld\n" +msgstr "Méret (tömörített): %ld\n" + +#: ../package.c:150 hunk ./src/pacman/po/hu.po 602 -#: ../package.c:153 +#: ../package.c:154 hunk ./src/pacman/po/hu.po 611 -#: ../package.c:157 +#: ../package.c:158 hunk ./src/pacman/po/hu.po 620 -#: ../package.c:186 +#: ../package.c:187 hunk ./src/pacman/po/hu.po 693 -msgstr " -f, --force a telepítés eröltetése, ütköző fájlok felülírása\n" +msgstr "" +" -f, --force a telepítés eröltetése, ütköző fájlok felülírása\n" hunk ./src/pacman/po/hu.po 711 -msgstr " -k, --dbonly csak az adatbázis-bejegyzés eltávolítása, magukat a fájlokat ne\n" +msgstr "" +" -k, --dbonly csak az adatbázis-bejegyzés eltávolítása, magukat a " +"fájlokat ne\n" hunk ./src/pacman/po/hu.po 725 -" -s, --recursive a függőségeket is távolítsa el (nem fogja a csomagokat tönkretenni)\n" +" -s, --recursive a függőségeket is távolítsa el (nem fogja a csomagokat " +"tönkretenni)\n" hunk ./src/pacman/po/hu.po 753 -" -e, --orphans az összes olyan csomag listázása amely függőségként került telepítésre\n" +" -e, --orphans az összes olyan csomag listázása amely függőségként " +"került telepítésre\n" hunk ./src/pacman/po/hu.po 782 -" -m, --foreign az összes olyan csomag listázása amely a távoli adatbázis(ok)ban" -"nem volt megtalálható\n" +" -m, --foreign az összes olyan csomag listázása amely a távoli " +"adatbázis(ok)bannem volt megtalálható\n" hunk ./src/pacman/po/hu.po 808 -msgstr "" -" -s, --search keresés a helyileg telepített csomagok között\n" +msgstr " -s, --search keresés a helyileg telepített csomagok között\n" hunk ./src/pacman/po/hu.po 821 -" -c, --clean a régi csomagok eltávolítása a gyorsítótár könyvtárából " -"(használja a '-cc'-t az összeshez)\n" +" -c, --clean a régi csomagok eltávolítása a gyorsítótár " +"könyvtárából (használja a '-cc'-t az összeshez)\n" hunk ./src/pacman/po/hu.po 851 -msgstr "" -" -w, --downloadonly csak letöltés, de semmit nem telepít/frissít\n" +msgstr " -w, --downloadonly csak letöltés, de semmit nem telepít/frissít\n" hunk ./src/pacman/po/hu.po 857 -msgstr "" -" -y, --refresh friss csomagadatbázis letöltése a szerverről\n" +msgstr " -y, --refresh friss csomagadatbázis letöltése a szerverről\n" hunk ./src/pacman/po/hu.po 864 -" --ignore egy csomag frissítésének figyelmen kívül hagyása (többször is használható)\n" +" --ignore egy csomag frissítésének figyelmen kívül hagyása " +"(többször is használható)\n" hunk ./src/pacman/po/hu.po 899 -msgstr " -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n" +msgstr "" +" -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n" hunk ./src/pacman/po/hu.po 910 -msgstr " Ezt a programot bárki a General Public License-ben\n" +msgstr "" +" Ezt a programot bárki a General Public License-ben\n" hunk ./src/pacman/po/hu.po 918 -#: ../pacman.c:356 +#: ../pacman.c:363 hunk ./src/pacman/po/hu.po 922 -#: ../pacman.c:383 +#: ../pacman.c:390 hunk ./src/pacman/po/hu.po 926 -#: ../pacman.c:475 +#: ../pacman.c:486 hunk ./src/pacman/po/hu.po 930 -#: ../pacman.c:499 +#: ../pacman.c:510 hunk ./src/pacman/po/hu.po 935 -#: ../pacman.c:512 +#: ../pacman.c:523 hunk ./src/pacman/po/hu.po 940 -#: ../pacman.c:516 +#: ../pacman.c:527 hunk ./src/pacman/po/hu.po 945 -#: ../pacman.c:524 +#: ../pacman.c:535 hunk ./src/pacman/po/hu.po 950 -#: ../pacman.c:529 ../sync.c:724 +#: ../pacman.c:540 ../sync.c:733 hunk ./src/pacman/po/hu.po 955 -#: ../pacman.c:545 +#: ../pacman.c:554 hunk ./src/pacman/po/hu.po 959 -#: ../pacman.c:551 +#: ../pacman.c:560 hunk ./src/pacman/po/hu.po 964 -#: ../pacman.c:558 +#: ../pacman.c:567 hunk ./src/pacman/po/hu.po 968 -#: ../pacman.c:571 +#: ../pacman.c:580 hunk ./src/pacman/po/hu.po 1015 -#: ../remove.c:64 ../sync.c:498 +#: ../remove.c:64 ../sync.c:500 hunk ./src/pacman/po/hu.po 1098 -msgstr "nem sikerült megkapni az utolsó módosítási időpontját a következőnek: %s (nincs sok esély)\n" +msgstr "" +"nem sikerült megkapni az utolsó módosítási időpontját a következőnek: %s " +"(nincs sok esély)\n" hunk ./src/pacman/po/hu.po 1169 -#: ../sync.c:467 ../sync.c:487 +#: ../sync.c:467 ../sync.c:488 hunk ./src/pacman/po/hu.po 1174 -#: ../sync.c:504 +#: ../sync.c:506 hunk ./src/pacman/po/hu.po 1178 -#: ../sync.c:511 +#: ../sync.c:513 hunk ./src/pacman/po/hu.po 1183 -#: ../sync.c:534 +#: ../sync.c:536 hunk ./src/pacman/po/hu.po 1186 -msgstr "nem sikerült hozzáadni a '%s' célt: nem található a távoli adatbázisban\n" +msgstr "" +"nem sikerült hozzáadni a '%s' célt: nem található a távoli adatbázisban\n" hunk ./src/pacman/po/hu.po 1189 -#: ../sync.c:552 +#: ../sync.c:554 hunk ./src/pacman/po/hu.po 1193 -#: ../sync.c:552 +#: ../sync.c:554 hunk ./src/pacman/po/hu.po 1197 -#: ../sync.c:618 +#: ../sync.c:622 hunk ./src/pacman/po/hu.po 1205 -#: ../sync.c:630 +#: ../sync.c:638 hunk ./src/pacman/po/hu.po 1213 -#: ../sync.c:633 +#: ../sync.c:641 hunk ./src/pacman/po/hu.po 1222 -#: ../sync.c:639 +#: ../sync.c:642 +#, fuzzy, c-format +msgid "" +"\n" +"Total Uncompressed Package Size: %.1f MB\n" +msgstr "" +"\n" +"Teljes csomagméret: %.1f MB\n" + +#: ../sync.c:648 hunk ./src/pacman/po/hu.po 1239 -#: ../sync.c:643 +#: ../sync.c:652 hunk ./src/pacman/po/hu.po 1243 -#: ../sync.c:651 +#: ../sync.c:660 hunk ./src/pacman/po/hu.po 1251 -#: ../sync.c:655 +#: ../sync.c:664 hunk ./src/pacman/po/hu.po 1255 -#: ../sync.c:702 +#: ../sync.c:711 hunk ./src/pacman/po/hu.po 1260 -#: ../sync.c:710 +#: ../sync.c:719 hunk ./src/pacman/po/hu.po 1270 -#: ../sync.c:714 +#: ../sync.c:723 hunk ./src/pacman/po/hu.po 1275 -#: ../sync.c:715 +#: ../sync.c:724 hunk ./src/pacman/po/hu.po 1283 -#: ../sync.c:720 -msgid "couldn't create package cache, using /tmp instead" +#: ../sync.c:729 +#, fuzzy +msgid "couldn't create package cache, using /tmp instead\n" hunk ./src/pacman/po/hu.po 1288 -#: ../sync.c:721 +#: ../sync.c:730 hunk ./src/pacman/po/hu.po 1290 -msgstr "figyelmeztetés: nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp használata" +msgstr "" +"figyelmeztetés: nem sikerült létrehozni a csomag-gyorsítótárat, a /tmp " +"használata" hunk ./src/pacman/po/hu.po 1294 -#: ../sync.c:731 +#: ../sync.c:740 hunk ./src/pacman/po/hu.po 1352 -msgstr ":: a %s igényli a %s-t, de az az IgnorePkg része. Mégis telepíti? [I/n] " +msgstr "" +":: a %s igényli a %s-t, de az az IgnorePkg része. Mégis telepíti? [I/n] " hunk ./src/pacman/po/pacman.pot 11 -"POT-Creation-Date: 2006-05-06 17:24+0200\n" +"POT-Creation-Date: 2006-06-03 03:44+0200\n" hunk ./src/pacman/po/pacman.pot 40 -#: ../add.c:91 ../remove.c:109 ../sync.c:546 +#: ../add.c:91 ../remove.c:109 ../sync.c:548 hunk ./src/pacman/po/pacman.pot 50 -#: ../add.c:110 ../sync.c:567 +#: ../add.c:110 ../sync.c:569 hunk ./src/pacman/po/pacman.pot 55 -#: ../add.c:120 ../sync.c:753 +#: ../add.c:120 ../sync.c:762 hunk ./src/pacman/po/pacman.pot 60 -#: ../add.c:127 ../sync.c:760 +#: ../add.c:127 ../sync.c:769 hunk ./src/pacman/po/pacman.pot 65 -#: ../add.c:135 ../sync.c:768 ../sync.c:775 +#: ../add.c:135 ../sync.c:777 ../sync.c:784 hunk ./src/pacman/po/pacman.pot 71 -#: ../add.c:147 ../remove.c:149 ../sync.c:746 +#: ../add.c:147 ../remove.c:149 ../sync.c:755 hunk ./src/pacman/po/pacman.pot 76 -#: ../add.c:154 ../remove.c:159 ../sync.c:454 ../sync.c:795 +#: ../add.c:154 ../remove.c:159 ../sync.c:454 ../sync.c:804 hunk ./src/pacman/po/pacman.pot 145 -#: ../conf.c:209 ../conf.c:217 ../pacman.c:535 +#: ../conf.c:209 ../conf.c:217 ../pacman.c:546 hunk ./src/pacman/po/pacman.pot 377 -#: ../log.c:51 +#: ../log.c:55 hunk ./src/pacman/po/pacman.pot 382 -#: ../log.c:54 +#: ../log.c:58 hunk ./src/pacman/po/pacman.pot 387 -#: ../log.c:57 +#: ../log.c:61 hunk ./src/pacman/po/pacman.pot 392 -#: ../log.c:60 +#: ../log.c:64 hunk ./src/pacman/po/pacman.pot 397 -#: ../log.c:63 +#: ../log.c:67 hunk ./src/pacman/po/pacman.pot 402 -#: ../log.c:66 +#: ../log.c:70 hunk ./src/pacman/po/pacman.pot 407 -#: ../log.c:152 +#: ../log.c:154 hunk ./src/pacman/po/pacman.pot 411 -#: ../log.c:152 +#: ../log.c:154 hunk ./src/pacman/po/pacman.pot 581 +msgid "Size (uncompressed):%ld\n" +msgstr "" + +#: ../package.c:150 +#, c-format hunk ./src/pacman/po/pacman.pot 589 -#: ../package.c:153 +#: ../package.c:154 hunk ./src/pacman/po/pacman.pot 596 -#: ../package.c:157 +#: ../package.c:158 hunk ./src/pacman/po/pacman.pot 603 -#: ../package.c:186 +#: ../package.c:187 hunk ./src/pacman/po/pacman.pot 879 -#: ../pacman.c:356 +#: ../pacman.c:363 hunk ./src/pacman/po/pacman.pot 883 -#: ../pacman.c:383 +#: ../pacman.c:390 hunk ./src/pacman/po/pacman.pot 887 -#: ../pacman.c:475 +#: ../pacman.c:486 hunk ./src/pacman/po/pacman.pot 891 -#: ../pacman.c:499 +#: ../pacman.c:510 hunk ./src/pacman/po/pacman.pot 896 -#: ../pacman.c:512 +#: ../pacman.c:523 hunk ./src/pacman/po/pacman.pot 901 -#: ../pacman.c:516 +#: ../pacman.c:527 hunk ./src/pacman/po/pacman.pot 906 -#: ../pacman.c:524 +#: ../pacman.c:535 hunk ./src/pacman/po/pacman.pot 911 -#: ../pacman.c:529 ../sync.c:724 +#: ../pacman.c:540 ../sync.c:733 hunk ./src/pacman/po/pacman.pot 916 -#: ../pacman.c:545 +#: ../pacman.c:554 hunk ./src/pacman/po/pacman.pot 920 -#: ../pacman.c:551 +#: ../pacman.c:560 hunk ./src/pacman/po/pacman.pot 925 -#: ../pacman.c:558 +#: ../pacman.c:567 hunk ./src/pacman/po/pacman.pot 929 -#: ../pacman.c:571 +#: ../pacman.c:580 hunk ./src/pacman/po/pacman.pot 976 -#: ../remove.c:64 ../sync.c:498 +#: ../remove.c:64 ../sync.c:500 hunk ./src/pacman/po/pacman.pot 1122 -#: ../sync.c:467 ../sync.c:487 +#: ../sync.c:467 ../sync.c:488 hunk ./src/pacman/po/pacman.pot 1127 -#: ../sync.c:504 +#: ../sync.c:506 hunk ./src/pacman/po/pacman.pot 1131 -#: ../sync.c:511 +#: ../sync.c:513 hunk ./src/pacman/po/pacman.pot 1136 -#: ../sync.c:534 +#: ../sync.c:536 hunk ./src/pacman/po/pacman.pot 1141 -#: ../sync.c:552 +#: ../sync.c:554 hunk ./src/pacman/po/pacman.pot 1145 -#: ../sync.c:552 +#: ../sync.c:554 hunk ./src/pacman/po/pacman.pot 1149 -#: ../sync.c:618 +#: ../sync.c:622 hunk ./src/pacman/po/pacman.pot 1155 -#: ../sync.c:630 +#: ../sync.c:638 hunk ./src/pacman/po/pacman.pot 1161 -#: ../sync.c:633 +#: ../sync.c:641 hunk ./src/pacman/po/pacman.pot 1168 -#: ../sync.c:639 +#: ../sync.c:642 +#, c-format +msgid "" +"\n" +"Total Uncompressed Package Size: %.1f MB\n" +msgstr "" + +#: ../sync.c:648 hunk ./src/pacman/po/pacman.pot 1181 -#: ../sync.c:643 +#: ../sync.c:652 hunk ./src/pacman/po/pacman.pot 1185 -#: ../sync.c:651 +#: ../sync.c:660 hunk ./src/pacman/po/pacman.pot 1191 -#: ../sync.c:655 +#: ../sync.c:664 hunk ./src/pacman/po/pacman.pot 1195 -#: ../sync.c:702 +#: ../sync.c:711 hunk ./src/pacman/po/pacman.pot 1200 -#: ../sync.c:710 +#: ../sync.c:719 hunk ./src/pacman/po/pacman.pot 1208 -#: ../sync.c:714 +#: ../sync.c:723 hunk ./src/pacman/po/pacman.pot 1213 -#: ../sync.c:715 +#: ../sync.c:724 hunk ./src/pacman/po/pacman.pot 1221 -#: ../sync.c:720 -msgid "couldn't create package cache, using /tmp instead" +#: ../sync.c:729 +msgid "couldn't create package cache, using /tmp instead\n" hunk ./src/pacman/po/pacman.pot 1225 -#: ../sync.c:721 +#: ../sync.c:730 hunk ./src/pacman/po/pacman.pot 1229 -#: ../sync.c:731 +#: ../sync.c:740 } From vmiklos at frugalware.org Sat Jun 3 04:07:40 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 04:07:48 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso: typo fix in mkiso() Message-ID: <20060603020741.716B8FB4017@genesis.frugalware.org> [mkiso: typo fix in mkiso() VMiklos **20060603020249] { hunk ./mkiso/mkiso.c 199 - iso_add(fp, "frugalware-%s/frugalware-current.fdb"); - iso_add(fp, "extra/frugalware-%s/extra-current.fdb"); + iso_add(fp, "frugalware-%s/frugalware-current.fdb", volume->arch); + iso_add(fp, "extra/frugalware-%s/extra-current.fdb", volume->arch); } From crazy at frugalware.org Sat Jun 3 04:25:39 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 04:25:41 2006 Subject: [Frugalware-darcs] frugalware-current: kopete-0.12.0-1-i686 Message-ID: <20060603022539.41018FB4017@genesis.frugalware.org> [kopete-0.12.0-1-i686 crazy **20060603010951 * New old package :P * should compile on x86_64 but will not befor someone compile -- the new depends() for x86_64 :S ] { adddir ./source/kde/kopete addfile ./source/kde/kopete/FrugalBuild hunk ./source/kde/kopete/FrugalBuild 1 +# Last Modified: Sat, 03 Jun 2006 02:36:02 +0200 +# Compiling Time: 8.13 SBU +# Maintainer: crazy + +pkgname=kopete +pkgver=0.12.0 +pkgrel=1 +pkgdesc="Kopete is a multi-protocol instant messenger, written for the KDE desktop." +url="http://kopete.kde.org/" +depends=('kdenetwork>=3.5.3-2' 'libxscrnsaver' 'xmms' 'ortp=0.7.1' 'perl-io-socket-ssl' 'qca-tls' \ + 'gnutls' 'ilbc' 'speex' 'libidn' 'meanwhile') +makedepends=('qt-docs' 'doxygen') +groups=('kde' 'kde-apps') +archs=('i686' 'x86_64') +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge kdeapps +sha1sums=('0bc39e5d28ea2b0ef460c57614bb625d9e7d7219') + +build() +{ + Fcd + rm -f configure || return 1 + make -f admin/Makefile.common cvs || return 1 + Fbuild --without-debug --disable-debug \ + --with-speex \ + --enable-jingle \ + --disable-meanwhile \ + --disable-final \ + --disable-warnings \ + --enable-gcc-hidden-visibility + ## meanwhile ## broken +} + +# optimization OK } From alex.extreme2 at gmail.com Sat Jun 3 08:27:38 2006 From: alex.extreme2 at gmail.com (alex_extreme) Date: Sat Jun 3 08:27:42 2006 Subject: [Frugalware-darcs] frugalware-current: drupal-4.7.2-1-i686 Message-ID: <20060603062738.CD0C4FB4017@genesis.frugalware.org> [drupal-4.7.2-1-i686 alex_extreme **20060603062615 * version bump ] { hunk ./extra/source/network/drupal/FrugalBuild 1 -# Last Modified: Fri, 26 May 2006 07:19:54 +0100 +# Last Modified: Sat, 03 Jun 2006 07:24:43 +0100 hunk ./extra/source/network/drupal/FrugalBuild 6 -pkgver=4.7.1 +pkgver=4.7.2 hunk ./extra/source/network/drupal/FrugalBuild 18 -sha1sums=('ddf27ea2209c74b3ea806b213962645d19c17650' \ +sha1sums=('004c420d837e8a02fe4abaa7c01db14a93bc85cc' \ } From alex.extreme2 at gmail.com Sat Jun 3 08:50:03 2006 From: alex.extreme2 at gmail.com (alex_extreme) Date: Sat Jun 3 08:50:08 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-menus-2.14.0-2-i686 Message-ID: <20060603065003.94EFBFB4017@genesis.frugalware.org> [gnome-menus-2.14.0-2-i686 alex_extreme **20060603064758 * added gmenu_tree_directory_get_desktop_file_path.patch * closes #746 ] { hunk ./source/gnome/gnome-menus/FrugalBuild 1 -# Last modified: Fri, 14 Apr 2006 10:53:48 +0200 +# Last modified: Sat, 03 Jun 2006 07:44:35 +0100 hunk ./source/gnome/gnome-menus/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/gnome/gnome-menus/FrugalBuild 16 -sha1sums=('faef5d654df39cc2174c8f38e20ad165bb65d286') +source=(${source[@]} gmenu_tree_directory_get_desktop_file_path.patch) +sha1sums=('faef5d654df39cc2174c8f38e20ad165bb65d286' + 'e5d255561b61d1752a5f438bacda4eec17a3917c') addfile ./source/gnome/gnome-menus/gmenu_tree_directory_get_desktop_file_path.patch hunk ./source/gnome/gnome-menus/gmenu_tree_directory_get_desktop_file_path.patch 1 +diff -urN gnome-menus-2.14.0.old/libmenu/desktop-entries.c gnome-menus-2.14.0/libmenu/desktop-entries.c +--- gnome-menus-2.14.0.old/libmenu/desktop-entries.c 2006-04-21 14:18:57.000000000 -0500 ++++ gnome-menus-2.14.0/libmenu/desktop-entries.c 2006-04-21 14:19:10.000000000 -0500 +@@ -47,6 +47,7 @@ + char *comment; + char *icon; + char *exec; ++ gboolean terminal; + + guint type : 2; + guint flags : 4; +@@ -278,7 +279,10 @@ + retval->categories = get_categories_from_key_file (retval, key_file, desktop_entry_group); + + if (entry->type == DESKTOP_ENTRY_DESKTOP) +- retval->exec = g_key_file_get_string (key_file, desktop_entry_group, "Exec", NULL); ++ { ++ retval->exec = g_key_file_get_string (key_file, desktop_entry_group, "Exec", NULL); ++ retval->terminal = g_key_file_get_boolean (key_file, desktop_entry_group, "Terminal", NULL); ++ } + + #undef GET_LOCALE_STRING + +@@ -356,6 +360,7 @@ + g_free (entry->exec); + entry->exec = NULL; + ++ entry->terminal = 0; + entry->flags = 0; + + return desktop_entry_load (entry); +@@ -391,6 +396,7 @@ + retval->comment = g_strdup (entry->comment); + retval->icon = g_strdup (entry->icon); + retval->exec = g_strdup (entry->exec); ++ retval->terminal = entry->terminal; + retval->flags = entry->flags; + + i = 0; +@@ -488,6 +494,12 @@ + } + + gboolean ++desktop_entry_get_launch_in_terminal (DesktopEntry *entry) ++{ ++ return entry->terminal; ++} ++ ++gboolean + desktop_entry_get_hidden (DesktopEntry *entry) + { + return (entry->flags & DESKTOP_ENTRY_HIDDEN) != 0; +diff -urN gnome-menus-2.14.0.old/libmenu/desktop-entries.h gnome-menus-2.14.0/libmenu/desktop-entries.h +--- gnome-menus-2.14.0.old/libmenu/desktop-entries.h 2006-04-21 14:18:57.000000000 -0500 ++++ gnome-menus-2.14.0/libmenu/desktop-entries.h 2006-04-21 14:19:10.000000000 -0500 +@@ -44,10 +44,11 @@ + const char *desktop_entry_get_path (DesktopEntry *entry); + const char *desktop_entry_get_basename (DesktopEntry *entry); + +-const char *desktop_entry_get_name (DesktopEntry *entry); +-const char *desktop_entry_get_comment (DesktopEntry *entry); +-const char *desktop_entry_get_icon (DesktopEntry *entry); +-const char *desktop_entry_get_exec (DesktopEntry *entry); ++const char *desktop_entry_get_name (DesktopEntry *entry); ++const char *desktop_entry_get_comment (DesktopEntry *entry); ++const char *desktop_entry_get_icon (DesktopEntry *entry); ++const char *desktop_entry_get_exec (DesktopEntry *entry); ++gboolean desktop_entry_get_launch_in_terminal (DesktopEntry *entry); + + gboolean desktop_entry_get_hidden (DesktopEntry *entry); + gboolean desktop_entry_get_no_display (DesktopEntry *entry); +diff -urN gnome-menus-2.14.0.old/libmenu/gmenu-tree.c gnome-menus-2.14.0/libmenu/gmenu-tree.c +--- gnome-menus-2.14.0.old/libmenu/gmenu-tree.c 2006-04-21 14:18:57.000000000 -0500 ++++ gnome-menus-2.14.0/libmenu/gmenu-tree.c 2006-04-21 14:19:22.000000000 -0500 +@@ -975,6 +975,17 @@ + } + + const char * ++gmenu_tree_directory_get_desktop_file_path (GMenuTreeDirectory *directory) ++{ ++ g_return_val_if_fail (directory != NULL, NULL); ++ ++ if (!directory->directory_entry) ++ return NULL; ++ ++ return desktop_entry_get_path (directory->directory_entry); ++} ++ ++const char * + gmenu_tree_directory_get_menu_id (GMenuTreeDirectory *directory) + { + g_return_val_if_fail (directory != NULL, NULL); +@@ -1090,6 +1101,14 @@ + return desktop_entry_get_exec (entry->desktop_entry); + } + ++gboolean ++gmenu_tree_entry_get_launch_in_terminal (GMenuTreeEntry *entry) ++{ ++ g_return_val_if_fail (entry != NULL, NULL); ++ ++ return desktop_entry_get_launch_in_terminal (entry->desktop_entry); ++} ++ + const char * + gmenu_tree_entry_get_desktop_file_path (GMenuTreeEntry *entry) + { +diff -urN gnome-menus-2.14.0.old/libmenu/gmenu-tree.h gnome-menus-2.14.0/libmenu/gmenu-tree.h +--- gnome-menus-2.14.0.old/libmenu/gmenu-tree.h 2006-04-21 14:18:57.000000000 -0500 ++++ gnome-menus-2.14.0/libmenu/gmenu-tree.h 2006-04-21 14:19:22.000000000 -0500 +@@ -99,6 +99,7 @@ + const char *gmenu_tree_directory_get_name (GMenuTreeDirectory *directory); + const char *gmenu_tree_directory_get_comment (GMenuTreeDirectory *directory); + const char *gmenu_tree_directory_get_icon (GMenuTreeDirectory *directory); ++const char *gmenu_tree_directory_get_desktop_file_path (GMenuTreeDirectory *directory); + const char *gmenu_tree_directory_get_menu_id (GMenuTreeDirectory *directory); + GMenuTree *gmenu_tree_directory_get_tree (GMenuTreeDirectory *directory); + +@@ -108,10 +109,11 @@ + GMenuTreeEntry *entry); + + +-const char *gmenu_tree_entry_get_name (GMenuTreeEntry *entry); +-const char *gmenu_tree_entry_get_comment (GMenuTreeEntry *entry); +-const char *gmenu_tree_entry_get_icon (GMenuTreeEntry *entry); +-const char *gmenu_tree_entry_get_exec (GMenuTreeEntry *entry); ++const char *gmenu_tree_entry_get_name (GMenuTreeEntry *entry); ++const char *gmenu_tree_entry_get_comment (GMenuTreeEntry *entry); ++const char *gmenu_tree_entry_get_icon (GMenuTreeEntry *entry); ++const char *gmenu_tree_entry_get_exec (GMenuTreeEntry *entry); ++gboolean gmenu_tree_entry_get_launch_in_terminal (GMenuTreeEntry *entry); + + const char *gmenu_tree_entry_get_desktop_file_path (GMenuTreeEntry *entry); + const char *gmenu_tree_entry_get_desktop_file_id (GMenuTreeEntry *entry); +diff -urN gnome-menus-2.14.0.old/python/gmenu.c gnome-menus-2.14.0/python/gmenu.c +--- gnome-menus-2.14.0.old/python/gmenu.c 2006-04-21 14:18:57.000000000 -0500 ++++ gnome-menus-2.14.0/python/gmenu.c 2006-04-21 14:19:22.000000000 -0500 +@@ -351,6 +351,31 @@ + } + + static PyObject * ++pygmenu_tree_directory_get_desktop_file_path (PyObject *self, ++ PyObject *args) ++{ ++ PyGMenuTreeDirectory *directory; ++ const char *path; ++ ++ if (args != NULL) ++ { ++ if (!PyArg_ParseTuple (args, ":gmenu.Directory.get_desktop_file_path")) ++ return NULL; ++ } ++ ++ directory = (PyGMenuTreeDirectory *) self; ++ ++ path = gmenu_tree_directory_get_desktop_file_path (GMENU_TREE_DIRECTORY (directory->item)); ++ if (path == NULL) ++ { ++ Py_INCREF (Py_None); ++ return Py_None; ++ } ++ ++ return PyString_FromString (path); ++} ++ ++static PyObject * + pygmenu_tree_directory_get_menu_id (PyObject *self, + PyObject *args) + { +@@ -446,13 +471,14 @@ + + if (!strcmp (attr, "__members__")) + { +- return Py_BuildValue ("[ssssssss]", ++ return Py_BuildValue ("[sssssssss]", + "type", + "parent", + "contents", + "name", + "comment", + "icon", ++ "desktop_file_path", + "menu_id", + "tree"); + } +@@ -480,6 +506,10 @@ + { + return pygmenu_tree_directory_get_icon ((PyObject *) self, NULL); + } ++ else if (!strcmp (attr, "desktop_file_path")) ++ { ++ return pygmenu_tree_directory_get_desktop_file_path ((PyObject *) self, NULL); ++ } + else if (!strcmp (attr, "menu_id")) + { + return pygmenu_tree_directory_get_menu_id ((PyObject *) self, NULL); +@@ -499,6 +529,7 @@ + { "get_name", pygmenu_tree_directory_get_name, METH_VARARGS }, + { "get_comment", pygmenu_tree_directory_get_comment, METH_VARARGS }, + { "get_icon", pygmenu_tree_directory_get_icon, METH_VARARGS }, ++ { "get_desktop_file_path", pygmenu_tree_directory_get_desktop_file_path, METH_VARARGS }, + { "get_menu_id", pygmenu_tree_directory_get_menu_id, METH_VARARGS }, + { "get_tree", pygmenu_tree_directory_get_tree, METH_VARARGS }, + { "make_path", pygmenu_tree_directory_make_path, METH_VARARGS }, +@@ -674,6 +705,27 @@ + } + + static PyObject * ++pygmenu_tree_entry_get_launch_in_terminal (PyObject *self, ++ PyObject *args) ++{ ++ PyGMenuTreeEntry *entry; ++ PyObject *retval; ++ ++ if (args != NULL) ++ { ++ if (!PyArg_ParseTuple (args, ":gmenu.Entry.get_launch_in_terminal")) ++ return NULL; ++ } ++ ++ entry = (PyGMenuTreeEntry *) self; ++ ++ retval = gmenu_tree_entry_get_launch_in_terminal (GMENU_TREE_ENTRY (entry->item)) ? Py_True : Py_False; ++ Py_INCREF (retval); ++ ++ return retval; ++} ++ ++static PyObject * + pygmenu_tree_entry_get_desktop_file_path (PyObject *self, + PyObject *args) + { +@@ -745,6 +797,27 @@ + } + + static PyObject * ++pygmenu_tree_entry_get_is_nodisplay (PyObject *self, ++ PyObject *args) ++{ ++ PyGMenuTreeEntry *entry; ++ PyObject *retval; ++ ++ if (args != NULL) ++ { ++ if (!PyArg_ParseTuple (args, ":gmenu.Entry.get_is_nodisplay")) ++ return NULL; ++ } ++ ++ entry = (PyGMenuTreeEntry *) self; ++ ++ retval = gmenu_tree_entry_get_is_nodisplay (GMENU_TREE_ENTRY (entry->item)) ? Py_True : Py_False; ++ Py_INCREF (retval); ++ ++ return retval; ++} ++ ++static PyObject * + pygmenu_tree_entry_getattro (PyGMenuTreeEntry *self, + PyObject *py_attr) + { +@@ -756,16 +829,18 @@ + + if (!strcmp (attr, "__members__")) + { +- return Py_BuildValue ("[sssssssss]", ++ return Py_BuildValue ("[sssssssssss]", + "type", + "parent", + "name", + "comment", + "icon", + "exec_info", ++ "launch_in_terminal", + "desktop_file_path", + "desktop_file_id", +- "is_excluded"); ++ "is_excluded", ++ "is_nodisplay"); + } + else if (!strcmp (attr, "type")) + { +@@ -791,6 +866,10 @@ + { + return pygmenu_tree_entry_get_exec ((PyObject *) self, NULL); + } ++ else if (!strcmp (attr, "launch_in_terminal")) ++ { ++ return pygmenu_tree_entry_get_launch_in_terminal ((PyObject *) self, NULL); ++ } + else if (!strcmp (attr, "desktop_file_path")) + { + return pygmenu_tree_entry_get_desktop_file_path ((PyObject *) self, NULL); +@@ -803,6 +882,10 @@ + { + return pygmenu_tree_entry_get_is_excluded ((PyObject *) self, NULL); + } ++ else if (!strcmp (attr, "is_nodisplay")) ++ { ++ return pygmenu_tree_entry_get_is_nodisplay ((PyObject *) self, NULL); ++ } + } + + return PyObject_GenericGetAttr ((PyObject *) self, py_attr); +@@ -810,14 +893,16 @@ + + static struct PyMethodDef pygmenu_tree_entry_methods[] = + { +- { "get_name", pygmenu_tree_entry_get_name, METH_VARARGS }, +- { "get_comment", pygmenu_tree_entry_get_comment, METH_VARARGS }, +- { "get_icon", pygmenu_tree_entry_get_icon, METH_VARARGS }, +- { "get_exec", pygmenu_tree_entry_get_exec, METH_VARARGS }, +- { "get_desktop_file_path", pygmenu_tree_entry_get_desktop_file_path, METH_VARARGS }, +- { "get_desktop_file_id", pygmenu_tree_entry_get_desktop_file_id, METH_VARARGS }, +- { "get_is_excluded", pygmenu_tree_entry_get_is_excluded, METH_VARARGS }, +- { NULL, NULL, 0 } ++ { "get_name", pygmenu_tree_entry_get_name, METH_VARARGS }, ++ { "get_comment", pygmenu_tree_entry_get_comment, METH_VARARGS }, ++ { "get_icon", pygmenu_tree_entry_get_icon, METH_VARARGS }, ++ { "get_exec", pygmenu_tree_entry_get_exec, METH_VARARGS }, ++ { "get_launch_in_terminal", pygmenu_tree_entry_get_launch_in_terminal, METH_VARARGS }, ++ { "get_desktop_file_path", pygmenu_tree_entry_get_desktop_file_path, METH_VARARGS }, ++ { "get_desktop_file_id", pygmenu_tree_entry_get_desktop_file_id, METH_VARARGS }, ++ { "get_is_excluded", pygmenu_tree_entry_get_is_excluded, METH_VARARGS }, ++ { "get_is_nodisplay", pygmenu_tree_entry_get_is_nodisplay, METH_VARARGS }, ++ { NULL, NULL, 0 } + }; + + static PyTypeObject PyGMenuTreeEntry_Type = +@@ -1684,7 +1769,8 @@ + PyModule_AddIntConstant (mod, "TYPE_HEADER", GMENU_TREE_ITEM_HEADER); + PyModule_AddIntConstant (mod, "TYPE_ALIAS", GMENU_TREE_ITEM_ALIAS); + +- PyModule_AddIntConstant (mod, "FLAGS_NONE", GMENU_TREE_FLAGS_NONE); +- PyModule_AddIntConstant (mod, "FLAGS_INCLUDE_EXCLUDED", GMENU_TREE_FLAGS_INCLUDE_EXCLUDED); +- PyModule_AddIntConstant (mod, "FLAGS_SHOW_EMPTY", GMENU_TREE_FLAGS_SHOW_EMPTY); ++ PyModule_AddIntConstant (mod, "FLAGS_NONE", GMENU_TREE_FLAGS_NONE); ++ PyModule_AddIntConstant (mod, "FLAGS_INCLUDE_EXCLUDED", GMENU_TREE_FLAGS_INCLUDE_EXCLUDED); ++ PyModule_AddIntConstant (mod, "FLAGS_SHOW_EMPTY", GMENU_TREE_FLAGS_SHOW_EMPTY); ++ PyModule_AddIntConstant (mod, "FLAGS_INCLUDE_NODISPLAY", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY); + } } From vmiklos at frugalware.org Sat Jun 3 11:59:11 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 11:59:13 2006 Subject: [Frugalware-darcs] frugalware-current: openoffice.org-2.0.2.999.5-1-x86_64 Message-ID: <20060603095911.74505FB4017@genesis.frugalware.org> [openoffice.org-2.0.2.999.5-1-x86_64 VMiklos **20060603095644 version bump first patch-less build :-) ] { hunk ./source/xapps/openoffice.org/FrugalBuild 1 -# Last modified: Wed, 31 May 2006 02:28:28 +0200 +# Last modified: Sat, 03 Jun 2006 05:16:47 +0200 hunk ./source/xapps/openoffice.org/FrugalBuild 13 -milestone=4 +milestone=5 hunk ./source/xapps/openoffice.org/FrugalBuild 15 -snapshot=20060530 +snapshot=20060602 hunk ./source/xapps/openoffice.org/FrugalBuild 50 - http://go-ooo.org/packages/xt/xt-20051206-src-only.zip \ - openoffice.org-frugalware.diff) + http://go-ooo.org/packages/xt/xt-20051206-src-only.zip) + #openoffice.org-frugalware.diff) hunk ./source/xapps/openoffice.org/FrugalBuild 158 + sed -i '/^#/d' patches/src680/cws-vgbugs03.diff hunk ./source/xapps/openoffice.org/FrugalBuild 183 - Fsed 'openoffice' 'ooffice' desktop/openoffice.keys + Fsed 'openoffice' 'ooffice' desktop/openoffice.keys.in hunk ./source/xapps/openoffice.org/openoffice.org-frugalware.diff 1 -diff -Naur ooo-build.orig/distro-configs/Frugalware64.conf.in ooo-build/distro-configs/Frugalware64.conf.in ---- ooo-build.orig/distro-configs/Frugalware64.conf.in 2006-05-02 18:38:32.000000000 +0200 -+++ ooo-build/distro-configs/Frugalware64.conf.in 2006-05-20 02:15:33.000000000 +0200 -@@ -19,6 +19,7 @@ - --with-system-xml-apis - --with-system-nas - --with-java=gij -+--with-openclipart=/usr/share/openclipart - --enable-libart - --enable-libsn - --enable-kde -diff -Naur ooo-build.orig/distro-configs/Frugalware.conf.in ooo-build/distro-configs/Frugalware.conf.in ---- ooo-build.orig/distro-configs/Frugalware.conf.in 2006-05-02 18:38:32.000000000 +0200 -+++ ooo-build/distro-configs/Frugalware.conf.in 2006-05-20 02:14:51.000000000 +0200 -@@ -18,6 +18,7 @@ - --with-system-xerces - --with-system-xml-apis - --with-java=gij -+--with-openclipart=/usr/share/openclipart - --enable-libart - --enable-libsn - --enable-fontconfig rmfile ./source/xapps/openoffice.org/openoffice.org-frugalware.diff } From alex.extreme2 at gmail.com Sat Jun 3 12:19:06 2006 From: alex.extreme2 at gmail.com (alex_extreme) Date: Sat Jun 3 12:19:08 2006 Subject: [Frugalware-darcs] pacman-tools: mkiso.8: grammar fix Message-ID: <20060603101906.388BAFB4017@genesis.frugalware.org> [mkiso.8: grammar fix alex_extreme **20060603101838] { hunk ./mkiso/mkiso.8 73 -In the xml file primarily you should define the wished volumes. At least the -media of the volume is required. The media can be "net", "cd", or "dvd". The -"net" will not contain any fpm package. The only difference between "cd" and "dvd" +In the xml file primarily you should define the required volumes. The media +type of the volume is required at least. The media can be "net", "cd", or "dvd". The +"net" will not contain any fpm packages. The only difference between "cd" and "dvd" } From vmiklos at frugalware.org Sat Jun 3 12:36:16 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 12:36:20 2006 Subject: [Frugalware-darcs] frugalware-current: include/desktopdb.{install, sh} Message-ID: <20060603103616.EB4AFFB4017@genesis.frugalware.org> [include/desktopdb.{install,sh} VMiklos **20060603103457 new scheme for the commonly used "updating desktop database" scriptlet ] { addfile ./source/include/desktopdb.install hunk ./source/include/desktopdb.install 1 +post_install() +{ + echo -n "updating desktop database..." + if update-desktop-database > /dev/null 2>&1 ; then + echo " done." + else + echo " failed." + fi +} + +post_remove() +{ + post_install +} + +op=$1 +shift + +$op $* addfile ./source/include/desktopdb.sh hunk ./source/include/desktopdb.sh 1 +#!/bin/sh + +# (c) 2006 Miklos Vajna +# desktopdb.sh for Frugalware +# distributed under GPL License + +# common scriptlet for updatating the desktop database + +install=$Fincdir/desktopdb.install } From vmiklos at frugalware.org Sat Jun 3 12:36:16 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 12:36:22 2006 Subject: [Frugalware-darcs] frugalware-current: anjuta-1.2.4-4-i686 Message-ID: <20060603103617.9F114FB401A@genesis.frugalware.org> [anjuta-1.2.4-4-i686 VMiklos **20060603103357 use Finclude sourceforge desktopdb ] { hunk ./extra/source/gnome/anjuta/FrugalBuild 1 -# Last Modified: Thu, 25 May 2006 02:42:10 +0200 +# Last Modified: Sat, 03 Jun 2006 12:29:22 +0200 hunk ./extra/source/gnome/anjuta/FrugalBuild 9 -url="http://anjuta.sourceforge.net/" hunk ./extra/source/gnome/anjuta/FrugalBuild 11 +Finclude sourceforge desktopdb hunk ./extra/source/gnome/anjuta/FrugalBuild 13 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \ - anjuta-encodings.patch0) +source=(${source[@]} anjuta-encodings.patch0) hunk ./extra/source/gnome/anjuta/FrugalBuild 18 -install=$pkgname.install hunk ./extra/source/gnome/anjuta/FrugalBuild 22 + unset MAKEFLAGS hunk ./extra/source/gnome/anjuta/FrugalBuild 27 -# vim: ft=sh - hunk ./extra/source/gnome/anjuta/anjuta.install 1 -post_install() -{ - echo -n "updating desktop database..." - if update-desktop-database > /dev/null 2>&1 ; then - echo " done." - else - echo " failed." - fi -} - -post_remove() -{ - post_install -} - -op=$1 -shift - -$op $* - -# vim: ft=sh rmfile ./extra/source/gnome/anjuta/anjuta.install } From vmiklos at frugalware.org Sat Jun 3 12:40:50 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 12:40:52 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: bin xml/{authors, contributors, teams}.xml Message-ID: <20060603104050.5A97EFB4017@genesis.frugalware.org> [fwng: bin xml/{authors,contributors,teams}.xml VMiklos **20060603103910 the original ones are in -current and the engine now supports working from there ] { hunk ./frugalware/xml/authors.xml 1 - - - - - - - -]> - - - - - - Craciunescu, Gabriel - crazy|| - crazy@frugalware.org - KDE and KOffice maintainer - package maintainer - - - CsĂŠcsy, LĂĄszlĂł - boobaa - boobaa@ajrg.hu - package maintainer - - - CzĂśvek, KĂĄroly - slin - slinky@rei.keni.hu - network category maintainer - bug tracking system server hoster - - - Gondor, Viktor - Nadfoka - nadfoka@frugalware.org - frugalware artwork - - - Gosalia, Priyank - priyank - priyank@frugalware.org - package maintainer - - - Habermehl, Marcus - BMH1980 - bmh1980@frugalware.org - package maintainer - graphical config tools - - - Hamar, Christian - krix - krics@linuxforum.hu - x86_64 porter - GNOME co-maintainer - bugfixer, etc... - - - KĂĄpolnĂĄsi, TamĂĄs - aThom - ktamas@tdc.hu - package maintainer - - - Kimpe, David - DNAku - DNAku@frugalware.org - package maintainer - PPC porter - - - KovĂĄcs, JĂĄnos - janny - janny@frugalware.org - OpenOffice.org maintainer - package maintainer - - - Nagy, Bence - gimb - nagybence@tipogral.hu - package maintainer - - - Nemeth, MiklĂłs - desco - desco@frugalware.org - x86_64 porter - wx{gtk,python,glade} maintainer - GNOME co-maintainer - - - Smith, Alex - AlexExtreme - alex.extreme2@gmail.com - webapps maintainer - xen maintainer - package maintainer - - - Szalai, Zsolt - xbit` - xbit.lists@chello.hu - perl and its modules - - - Vajna, MiklĂłs - vmiklos - vmiklos@frugalware.org - Frugalware core - devel category maintainer - CD/DVD images maintainer - dns, ftp, rsync, mailman admin - - - Vasas, KrisztiĂĄn - IroNiQ - iron@frugalware.org - Hungarian translations - homepage maintainer - x86_64 server administrator - x86_64 porter - Xfce maintainer - package maintainer - - - VĂśrĂśskői, AndrĂĄs - voroskoi - voroskoi@frugalware.org - multimedia category maintainer - e17 maintainer - - rmfile ./frugalware/xml/authors.xml hunk ./frugalware/xml/contributors.xml 1 - - - - - - - -]> - - - - - - BalĂĄzs, Botond - Arcturus - arcturus_rocks@freemail.hu - German translations - - - BarabĂĄs, PĂŠter - z0d - z0d@artifact.hu - package contributions - - - Gondor, Viktor - Nadfoka - nadfoka@frugalware.org - Frugalware artwork - - - Kiss, ZoltĂĄn - djsmiley - djsmiley@inflame.hu - package contributions - - - NĂĄgi, ZsĂłfi - killahbunny - nagizs@yahoo.com - English spellchecks - - - PĂĄllya, KrisztiĂĄn - PChris - pchris@enternet.hu - Italian translations - - - Sipka, DĂĄniel - MSD - no1msd@gmail.com - Frugalware 0.2 artwork - - - TĂłth, RĂłbert - trobi - t.r@zmail.sk - Slovak translations - - - Leite, Pedro - pedro_jsl - pedro.leite@gmail.com - Brazillian translations - - rmfile ./frugalware/xml/contributors.xml hunk ./frugalware/xml/teams.xml 1 - - - - - - - - - - -]> - - - base - Frugalware core - - vmiklos@frugalware.org - - - krix@frugalware.org - x86_64 porting - - - desco@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - janny@frugalware.org - - - crazy@frugalware.org - x86_64 porting - - - gimb@frugalware.org - - - priyank@frugalware.org - - - voroskoi@frugalware.org - - - bmh1980@frugalware.org - - - athom@frugalware.org - - - slin@frugalware.org - grsec - - base - devel - - - kernel - kernel packages - - vmiklos@frugalware.org - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - alex@frugalware.org - xen packages - - - janny@frugalware.org - - base - - - lib - base libraries - - xbit@frugalware.org - - - voroskoi@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - janny@frugalware.org - - - alex@frugalware.org - - - boobaa@frugalware.org - - - bmh1980@frugalware.org - - - crazy@frugalware.org - - - desco@frugalware.org - x86_64 porting - - - iron@frugalware.org - x86_64 porting - - - athom@frugalware.org - - - priyank@frugalware.org - - lib - - - apps - cli applications - - boobaa@frugalware.org - - - slin@frugalware.org - - - voroskoi@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - iron@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - bmh1980@frugalware.org - - - janny@frugalware.org - - - desco@frugalware.org - - - alex@frugalware.org - - - crazy@frugalware.org - - - gimb@frugalware.org - - - priyank@frugalware.org - - - athom@frugalware.org - - apps - xapps - - - network - network packages - - iron@frugalware.org - - - priyank@frugalware.org - - - voroskoi@frugalware.org - - - slin@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - boobaa@frugalware.org - - - janny@frugalware.org - - - bmh1980@frugalware.org - - - gimb@frugalware.org - - - crazy@frugalware.org - - - desco@frugalware.org - x86_64 porting - - - athom@frugalware.org - - network - - - multimedia - cd and song players, codecs, encoders - - janny@frugalware.org - - - bmh1980@frugalware.org - - - voroskoi@frugalware.org - - - alex@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - boobaa@frugalware.org - - - crazy@frugalware.org - - - priyank@frugalware.org - - - desco@frugalware.org> - - - iron@frugalware.org - x86_64 porting - - multimedia - xmultimedia - - - gtk - gnome, xfce, gtk-related xapps - - iron@frugalware.org - - - bmh1980@frugalware.org - - - alex@frugalware.org - - - voroskoi@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - boobaa@frugalware.org - - - priyank@frugalware.org - - - desco@frugalware.org - - - janny@frugalware.org - - - crazy@frugalware.org - x86_64 porting - - - gimb@frugalware.org - - gnome - xfce4 - xapps - locale - - - qt - qt and kde - - athom@frugalware.org - - - crazy@frugalware.org - - - janny@frugalware.org - - - voroskoi@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - boobaa@frugalware.org - - - desco@frugalware.org - - - bmh1980@frugalware.org - - - priyank@frugalware.org - - - iron@frugalware.org - x86_64 porting - - kde - locale - - - webapps - cmses, wikis, forums, etc. - - alex@frugalware.org - - - iron@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - boobaa@frugalware.org - - - janny@frugalware.org - - network - - - perl - perl and its modules - - xbit@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - janny@frugalware.org - - devel - - - python - python and python related apps - - bmh1980@frugalware.org - - - alex@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - boobaa@frugalware.org - - - janny@frugalware.org - - - desco@frugalware.org - - - priyank@frugalware.org - - - iron@frugalware.org - x86_64 porting - - devel - xapps - - - e17 - enlightenment window manager v0.17 - - voroskoi@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - desco@frugalware.org - x86_64 porting - - - janny@frugalware.org - - e17 - - - games - game packages - - vmiklos@frugalware.org - i686 porting - - - priyank@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - boobaa@frugalware.org - - - voroskoi@frugalware.org - - - janny@frugalware.org - - - bmh1980@frugalware.org - - - gimb@frugalware.org - - - desco@frugalware.org - x86_64 porting - - - iron@frugalware.org - x86_64 porting - - - crazy@frugalware.org - - games - - - rox - The ROX desktop - - bmh1980@frugalware.org - - - vmiklos@frugalware.org - i686 porting - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - janny@frugalware.org - - - crazy@frugalware.org - - - iron@frugalware.org - x86_64 porting - - rox - - - xorg - X.Org packages & drivers - - krix@frugalware.org - - - iron@frugalware.org - nvidia binary driver - - - voroskoi@frugalware.org - ati binary driver - - - vmiklos@frugalware.org - i686 porting - - - dnaku@frugalware.org - ppc porting - - - alex@frugalware.org - - - janny@frugalware.org - - - boobaa@frugalware.org - - - bmh1980@frugalware.org - - - crazy@frugalware.org - - - desco@frugalare.org - x86_64 porting - - - gimb@frugalware.org - - - priyank@frugalware.org - - x11 - - - xlib - desktop environment independent libraries - - vmiklos@frugalware.org - - - bmh1980@frugalware.org - - - krix@frugalware.org - x86_64 porting - - - dnaku@frugalware.org - ppc porting - - - boobaa@frugalware.org - - - voroskoi@frugalware.org - - - janny@frugalware.org - - - alex@frugalware.org - - - desco@frugalware.org - - - crazy@frugalware.org - - - priyank@frugalware.org - - - iron@frugalware.org - x86_64 porting - - xlib - - - emul - emul packages maintaince - - krix@frugalware.org - - emul - - - rmfile ./frugalware/xml/teams.xml } From vmiklos at frugalware.org Sat Jun 3 12:41:51 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 12:41:54 2006 Subject: [Frugalware-darcs] homepage-ng: fwng: typo fix in authors.php Message-ID: <20060603104152.00911FB4017@genesis.frugalware.org> [fwng: typo fix in authors.php VMiklos **20060603104136] { hunk ./frugalware/authors.php 71 - $xmlfile = "xml/contributors.xml"; + $xmlfile = $docs_path."xml/contributors.xml"; } From vmiklos at frugalware.org Sat Jun 3 12:45:58 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 12:46:02 2006 Subject: [Frugalware-darcs] frugalware-current: docs/xml/media.xml: moved to the homepage-ng repo Message-ID: <20060603104559.06385FB4017@genesis.frugalware.org> [docs/xml/media.xml: moved to the homepage-ng repo VMiklos **20060603104441] { hunk ./docs/xml/media.xml 1 - - - - - - - - -]> - - - - -
    - 2006-05-22 - English - DistroWatch - Interview: MiklĂłs Vajna, Frugalware Linux - http://distrowatch.com/weekly.php?issue=20060522#interview -
    -
    - 2006-05-10 - English - Linux.com - Review: Frugalware Linux - http://www.linux.com/article.pl?sid=06/04/27/1947239 -
    -
    - 2006-04-26 - English - Slack Addict - Interview with Frugalware Linux developer, VMiklos - http://www.slackaddict.com/page.php?6 -
    -
    - 2006-04-18 - French - QuebecOS - Frugalware 0.4: toute la puissance de votre processeur! - http://www.quebecos.com/modules/sections/index.php?op=viewarticle&artid=45 -
    -
    - 2006-04-18 - English - NewsForge - My desktop OS: Frugalware - http://os.newsforge.com/article.pl?sid=06/04/12/1555253 -
    -
    - 2006-04-06 - English - Wikinews - Frugalware Linux Pushes Forward - http://en.wikinews.org/wiki/Frugalware_Linux_Pushes_Forward -
    -
    - 2006-03-06 - English - OSDir - Frugalware Linux 0.4 RC1 Screenshot Tour - http://www.osdir.com/Article8370.phtml -
    -
    - 2005-07-06 - English - LinuxQuestions - Reviews - 0.2 Aurora - http://www.linuxquestions.org/reviews/showproduct.php/product/565 -
    -
    - 2005-06-26 - English - Tuxmachines - For the best in today's fashions: Frugalware - http://www.tuxmachines.org/node/1501 -
    -
    - 2005-06-10 - English - NewsForge - My Workstation OS: Frugalware - http://os.newsforge.com/os/05/06/03/2046247.shtml -
    -
    - 2005-05-09 - English - DistroWatch - Featured distribution of the week: Frugalware Linux - http://distrowatch.com/weekly.php?issue=20050509#fdow -
    -
    - 2005-04-28 - Hungarian - jox - Interview with Frugalware Linux leader, developed in Hungary - http://www.jox.hu/cikkek/141/12 -
    -
    - 2004-11-03 - Hungarian - HUP - Interview with Frugalware project leader - http://hup.hu/node/7264 -
    -     rmfile ./docs/xml/media.xml } From vmiklos at frugalware.org Sat Jun 3 12:48:40 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 12:48:43 2006 Subject: [Frugalware-darcs] pacman-tools: updates for 0.7.5 Message-ID: <20060603104840.BACF2FB4019@genesis.frugalware.org> [updates for 0.7.5 VMiklos **20060603104545] { hunk ./Makefile 19 -VERSION = 0.7.4 +VERSION = 0.7.5 hunk ./NEWS 3 +0.7.5 - new tool: mkiso. see man mkiso! } From vmiklos at frugalware.org Sat Jun 3 12:51:32 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 12:51:34 2006 Subject: [Frugalware-darcs] frugalware-current: openoffice.org-2.0.2.999.5-1-x86_64 Message-ID: <20060603105132.4889BFB4017@genesis.frugalware.org> [openoffice.org-2.0.2.999.5-1-x86_64 VMiklos **20060603105050 use include desktopdb ] { hunk ./source/xapps/openoffice.org/FrugalBuild 87 +Finclude desktopdb hunk ./source/xapps/openoffice.org/openoffice.org.install 1 -post_install() -{ - echo -n "updating desktop database... " - update-desktop-database > /dev/null 2>&1 - echo "done." -} - -post_upgrade() -{ - post_install -} - - -post_remove() -{ - post_install -} - -op=$1 -shift - -$op $* rmfile ./source/xapps/openoffice.org/openoffice.org.install } From vmiklos at frugalware.org Sat Jun 3 12:57:18 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 12:57:21 2006 Subject: [Frugalware-darcs] frugalware-current: pacman-tools-0.7.5-1-i686 Message-ID: <20060603105718.654CAFB4017@genesis.frugalware.org> [pacman-tools-0.7.5-1-i686 VMiklos **20060603105611 version bump updated depends() ] { hunk ./source/devel/pacman-tools/FrugalBuild 1 -# Last Modified: Sat, 20 May 2006 16:25:29 +0200 +# Last Modified: Sat, 03 Jun 2006 12:52:02 +0200 hunk ./source/devel/pacman-tools/FrugalBuild 6 -pkgver=0.7.4 +pkgver=0.7.5 hunk ./source/devel/pacman-tools/FrugalBuild 10 -depends=('bash' 'perl' 'pacman' 'wget' 'python' 'libxml2') +depends=('bash' 'perl' 'pacman' 'wget' 'python' 'libxml2' 'glib2') } From krics at linuxforum.hu Sat Jun 3 13:31:23 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jun 3 13:31:28 2006 Subject: [Frugalware-darcs] frugalware-current: xproto-7.0.7-1-x86_64 Message-ID: <20060603113123.266BAFB4017@genesis.frugalware.org> [xproto-7.0.7-1-x86_64 Christian Hamar alias krix **20060603113023 * Version bump ] { hunk ./source/x11/xproto/FrugalBuild 1 -# Last Modified: Fri, 05 May 2006 17:16:45 +0200 +# Last Modified: Sat, 03 Jun 2006 13:29:44 +0200 hunk ./source/x11/xproto/FrugalBuild 6 -pkgver=7.0.5 +pkgver=7.0.7 hunk ./source/x11/xproto/FrugalBuild 15 -sha1sums=('c4757c2051f5774fe35b0a6c7aa455ae684d6781') +sha1sums=('6ab18a07816003226b29486f568e74a0b2c81648') } From krics at linuxforum.hu Sat Jun 3 13:35:33 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jun 3 13:35:38 2006 Subject: [Frugalware-darcs] frugalware-current: xev-1.0.2-1-x86_64 Message-ID: <20060603113534.1CF03FB4017@genesis.frugalware.org> [xev-1.0.2-1-x86_64 Christian Hamar alias krix **20060603113459 * Version bump * Cleaned FB ] { hunk ./source/x11/xev/FrugalBuild 1 -# Last Modified: Mon, 23 Jan 2006 01:19:42 +0100 +# Last Modified: Sat, 03 Jun 2006 13:34:36 +0200 hunk ./source/x11/xev/FrugalBuild 6 -pkgver=1.0.1 +pkgver=1.0.2 hunk ./source/x11/xev/FrugalBuild 13 +makedepends=('inputproto') hunk ./source/x11/xev/FrugalBuild 15 +sha1sums=('21ea760863f512693e0dfac479f5aff58a52dcc8') hunk ./source/x11/xev/FrugalBuild 17 -# optimalization OK - -# vim: ft=sh -sha1sums=('9a7534606101282923d3e7a6c0731c64f3ced16b') -makedepends=('inputproto') +# optimization OK } From crazy at frugalware.org Sat Jun 3 13:43:42 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 13:43:45 2006 Subject: [Frugalware-darcs] frugalware-current: openslp-1.2.1-2-i686 Message-ID: <20060603114342.DB844FB4017@genesis.frugalware.org> [openslp-1.2.1-2-i686 crazy **20060602183728 * up2date() fix ] { hunk ./source/network/openslp/FrugalBuild 16 -up2date="lynx -dump http://www.openslp.org/|grep -m1 'stable'|sed 's/.*SLP \(.*\) .*/\1/'" +up2date="lynx -dump http://www.openslp.org/download.html|grep -m1 'tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" } From voroskoi at frugalware.org Sat Jun 3 15:12:22 2006 From: voroskoi at frugalware.org (voroskoi) Date: Sat Jun 3 15:12:25 2006 Subject: [Frugalware-darcs] frugalware-current: seamonkey-1.0.2-1-x86_64 Message-ID: <20060603131222.CD901FB4017@genesis.frugalware.org> [seamonkey-1.0.2-1-x86_64 voroskoi **20060603131129 version bump ] { hunk ./extra/source/xapps/seamonkey/FrugalBuild 1 -# Last modified: Sat, 15 Apr 2006 12:34:13 +0200 +# Last modified: Fri, 02 Jun 2006 23:40:10 +0200 hunk ./extra/source/xapps/seamonkey/FrugalBuild 6 -pkgver=1.0.1 +pkgver=1.0.2 hunk ./extra/source/xapps/seamonkey/FrugalBuild 16 -source=(http://ftp.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/$pkgname-$pkgver.source.tar.bz2 \ +source=(http://ftp.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/$pkgname-source-$pkgver.tar.bz2 \ hunk ./extra/source/xapps/seamonkey/FrugalBuild 21 -sha1sums=('e8673838903d50247d96ed42daf99c2adbd9f577' \ +sha1sums=('966e9a57269cd54f40312e5fdaa42e9f2c3fbcea' \ hunk ./extra/source/xapps/seamonkey/FrugalBuild 61 -# optimalization OK +# optimization OK } From crazy at frugalware.org Sat Jun 3 18:19:32 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 18:19:34 2006 Subject: [Frugalware-darcs] frugalware-current: eaccelerator-0.9.3-1-i686 Message-ID: <20060603161932.99516FB4017@genesis.frugalware.org> [eaccelerator-0.9.3-1-i686 crazy **20060603161630 * up2date() | source() | url() fix * also switched to Finclude sourceforge and s/.zip/.bz2/ * someone pls add x86_64 to archs() , krix ? :) ] { hunk ./extra/source/devel/eaccelerator/FrugalBuild 9 -url="http://eaccelerator.net/HomeUk" +url="http://eaccelerator.net/" hunk ./extra/source/devel/eaccelerator/FrugalBuild 11 -up2date="lynx -dump $url|grep -o -m 1 ' - eAccelerator [0-9\.]\+[0-9]'|sed 's| - eAccelerator ||'" -source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.zip \ - README.Frugalware) +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge +up2date="lynx -dump http://eaccelerator.net/|grep -m1 'Release-'|sed 's/.*e-\(.*\) -.*/\1/'" +source=(${source[@]} README.Frugalware) } From crazy at frugalware.org Sat Jun 3 18:19:32 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 18:19:36 2006 Subject: [Frugalware-darcs] frugalware-current: mtaskbar-0.7-2-i686 Message-ID: <20060603161932.DE3AEFB4019@genesis.frugalware.org> [mtaskbar-0.7-2-i686 crazy **20060603160312 * mute up2date() the website is off :/ ] { hunk ./extra/source/kde/mtaskbar/FrugalBuild 14 -up2date="lynx -dump http://www.uni-weimar.de/~wolff3/software/taskbar.html | grep 'latest' | grep -o '\([0-9]\+\.[0-9\.]*\)'" +up2date="$pkgver" +#up2date="lynx -dump http://www.uni-weimar.de/~wolff3/software/taskbar.html | grep 'latest' | grep -o '\([0-9]\+\.[0-9\.]*\)'" } From crazy at frugalware.org Sat Jun 3 18:34:04 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 18:34:07 2006 Subject: [Frugalware-darcs] frugalware-current: xmoto-0.1.12-1-i686 Message-ID: <20060603163405.0BA00FB4017@genesis.frugalware.org> [xmoto-0.1.12-1-i686 crazy **20060603163323 * source() | up2date() fix ] { hunk ./extra/source/games/xmoto/FrugalBuild 8 -pkgdesc="a challenging 2D motocross platform game" +pkgdesc="A challenging 2D motocross platform game." hunk ./extra/source/games/xmoto/FrugalBuild 13 -source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.gz xmoto-0.1.12-typos.patch) -up2date="lynx -dump 'http://royal.flof.dk/rasmus/?p=xmoto_downloads' | grep 'tar\.gz ' | sed 's/.*xmoto-\([0-9\.]\+\)-src.*/\1/'" +_F_sourceforge_ext="-src.tar.gz" +Finclude sourceforge +source=(${source[@]} xmoto-0.1.12-typos.patch) +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=139914|grep -m1 '.src.tar.gz'|sed 's/.*o-\(.*\).src.*/\1/'" } From crazy at frugalware.org Sat Jun 3 18:42:58 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 18:43:00 2006 Subject: [Frugalware-darcs] frugalware-current: lbreakout2-2.6beta_6-1-i686 Message-ID: <20060603164258.BC2E0FB4019@genesis.frugalware.org> [lbreakout2-2.6beta_6-1-i686 crazy **20060603164220 * up2date() fix ] { hunk ./extra/source/games/lbreakout2/FrugalBuild 13 -up2date="lynx -dump http://lgames.sourceforge.net/downloads.php | grep 'http.*lbreakout2.*\.tar\.gz' | sed -e 's/.*lbreakout2-\(.*\)\.tar\.gz.*/\1/' | sed -e 's/-/_/'" +up2date="lynx -dump http://lgames.sourceforge.net/downloads.php|grep -m1 'lbreakout2-'|sed -e 's/.*2-\(.*\)tar.gz .*/\1/' -e 's/-/_/'" } From vmiklos at frugalware.org Sat Jun 3 20:03:07 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 20:03:08 2006 Subject: [Frugalware-darcs] pacman: makepkg: fix for building a new chroot env Message-ID: <20060603180307.3757BFB4017@genesis.frugalware.org> [makepkg: fix for building a new chroot env VMiklos **20060603175929 without /tmp pacman can't lock the db ] { hunk ./scripts/makepkg 813 + mkdir -p "$CHROOTDIR/tmp" } From vmiklos at frugalware.org Sat Jun 3 21:30:54 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 21:30:56 2006 Subject: [Frugalware-darcs] pacman-tools: rf: upload subpackages to extra if necessary Message-ID: <20060603193054.DC896FB4017@genesis.frugalware.org> [rf: upload subpackages to extra if necessary VMiklos **20060603192751] { hunk ./rf 649 - $ev = apply "repoman -t $version up $pkgfile $repo/$repodir/" if $pkgfile; + my $repo_ = "extra" if(qx/LANG= LC_ALL= pacman -Qi -p $pkgfile/ =~ /Groups.*-extra/); + $ev = apply "repoman -t $version up $pkgfile $repo_/$repodir/" if $pkgfile; } From crazy at frugalware.org Sat Jun 3 21:47:12 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 21:47:15 2006 Subject: [Frugalware-darcs] frugalware-current: qtcurve-gtk-0.36-1-i686 Message-ID: <20060603194712.3A62DFB4017@genesis.frugalware.org> [qtcurve-gtk-0.36-1-i686 crazy **20060603194440 * up2date() $pkgver not sure why this gone from kde-look.org need to search the new location ] { hunk ./extra/source/kde/kde-theme-qtcurve/FrugalBuild 16 -up2date="lynx --dump http://www.kde-look.org/content/show.php?content=5065|grep -m 1 Version|sed 's/.*:\ \ //'" +up2date="$pkgver" ## for now +#up2date="lynx --dump http://www.kde-look.org/content/show.php?content=5065|grep -m 1 Version|sed 's/.*:\ \ //'" } From crazy at frugalware.org Sat Jun 3 22:08:50 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 22:08:52 2006 Subject: [Frugalware-darcs] frugalware-current: nvu-1.0-1-i686 Message-ID: <20060603200850.CE87FFB4017@genesis.frugalware.org> [nvu-1.0-1-i686 crazy **20060603200736 * up2date() fix s/.html/.php/ ] { hunk ./extra/source/xapps/nvu/FrugalBuild 13 -up2date="lynx -dump $url/Building_From_Source.html|grep ^Nvu |sed -n 's/Nvu //;1 p'" +up2date="lynx -dump $url/Building_From_Source.php|grep ^Nvu |sed -n 's/Nvu //;1 p'" } From crazy at frugalware.org Sat Jun 3 22:17:01 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 22:17:03 2006 Subject: [Frugalware-darcs] frugalware-current: wxgtk-2.6.3-7-i686 Message-ID: <20060603201701.9105FFB401A@genesis.frugalware.org> [wxgtk-2.6.3-7-i686 crazy **20060603201629 * up2date() | source() fix ] { hunk ./extra/source/xlib/wxgtk/FrugalBuild 13 -up2date="lynx -dump $url/downld2.htm|grep stable|sed -n 's/ *\([0-9\.]*\).*/\1/; 1 p'" -source=(http://dl.sourceforge.net/sourceforge/wxwindows/wxGTK-$pkgver.tar.bz2) +up2date="lynx -dump $url/downloads/| grep -m1 'Current Stable'|sed 's/.*]//'" +source=(http://heanet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-$pkgver.tar.bz2) } From crazy at frugalware.org Sat Jun 3 22:17:01 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 22:17:04 2006 Subject: [Frugalware-darcs] frugalware-current: wxgtk-u8-2.6.3-4-i686 Message-ID: <20060603201701.5F7E2FB4017@genesis.frugalware.org> [wxgtk-u8-2.6.3-4-i686 crazy **20060603201556 * up2date() | source() fix ] { hunk ./extra/source/xlib/wxgtk-u8/FrugalBuild 13 -up2date="lynx -dump $url/downld2.htm|grep stable|sed -n 's/ *\([0-9\.]*\).*/\1/; 1 p'" -source=(http://dl.sourceforge.net/sourceforge/wxwindows/wxGTK-$pkgver.tar.bz2) +up2date="lynx -dump $url/downloads/| grep -m1 'Current Stable'|sed 's/.*]//'" +source=(http://heanet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-$pkgver.tar.bz2) } From crazy at frugalware.org Sat Jun 3 22:28:49 2006 From: crazy at frugalware.org (crazy) Date: Sat Jun 3 22:28:50 2006 Subject: [Frugalware-darcs] frugalware-current: qtparted-0.4.5-2-i686 Message-ID: <20060603202849.269C5FB4019@genesis.frugalware.org> [qtparted-0.4.5-2-i686 crazy **20060603202802 * killed Debian Janny :-D ] { hunk ./extra/source/xapps/qtparted/FrugalBuild 18 +up2date="lynx -dump http://qtparted.sourceforge.net/download.en.html|grep -m1 '.tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'" } From krics at linuxforum.hu Sat Jun 3 22:37:19 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jun 3 22:37:23 2006 Subject: [Frugalware-darcs] frugalware-current: pacman-3.3.1-2-x86_64 Message-ID: <20060603203719.C6DB7FB4017@genesis.frugalware.org> [pacman-3.3.1-2-x86_64 Christian Hamar alias krix **20060603203630 * Release bump * Backported fix for makepkg and new lock creation - Fixes chroot transaction error* stuff ] { hunk ./source/base/pacman/FrugalBuild 1 -# Last Modified: Sat, 03 Jun 2006 00:47:34 +0200 +# Last Modified: Sat, 03 Jun 2006 22:31:52 +0200 hunk ./source/base/pacman/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/base/pacman/FrugalBuild 16 -source=($url/releases/$pkgname-$pkgver.tar.gz) -signatures=(${source[0]}.asc) +source=($url/releases/$pkgname-$pkgver.tar.gz makepkg-fix-from-darcs.patch) +signatures=("${source[0]}.asc" '') addfile ./source/base/pacman/makepkg-fix-from-darcs.patch hunk ./source/base/pacman/makepkg-fix-from-darcs.patch 1 +diff -Naur pacman-3.3.1.orig/scripts/makepkg pacman-3.3.1/scripts/makepkg +--- pacman-3.3.1.orig/scripts/makepkg 2006-06-03 22:23:58.937217144 +0200 ++++ pacman-3.3.1/scripts/makepkg 2006-06-03 22:22:35.000000000 +0200 +@@ -810,6 +810,7 @@ + cat /etc/pacman.conf >$_F_makepkg_pacconf + fi + fi ++ mkdir -p "$CHROOTDIR/tmp" + pacman -Syf $COREPKGS -r "$CHROOTDIR" --noconfirm --config $_F_makepkg_pacconf + if [ "$?" != "0" ]; then + error "Failed to build chroot environment." } From krics at linuxforum.hu Sat Jun 3 23:25:47 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jun 3 23:25:49 2006 Subject: [Frugalware-darcs] frugalware-current: libwnck-2.14.2-1-x86_64 Message-ID: <20060603212547.49AF8FB4017@genesis.frugalware.org> [libwnck-2.14.2-1-x86_64 Christian Hamar alias krix **20060603212504 * Version bump ] { hunk ./source/gnome/libwnck/FrugalBuild 1 -# Last modified: Tue, 11 Apr 2006 14:01:05 +0200 +# Last modified: Sat, 03 Jun 2006 23:22:54 +0200 hunk ./source/gnome/libwnck/FrugalBuild 6 -pkgver=2.14.1 +pkgver=2.14.2 hunk ./source/gnome/libwnck/FrugalBuild 16 -sha1sums=('d972b9430a1ff6ba1e9a7946fe7aa7612e2cd23f') +sha1sums=('8600141d8829357808780e1bbd888b5c227ae501') hunk ./source/gnome/libwnck/FrugalBuild 20 - Fbuild --enable-gtk-doc + if [ "$CARCH" == "x86_64" ]; then + Fbuild + else + Fbuild --enable-gtk-doc + fi } From vmiklos at frugalware.org Sat Jun 3 23:27:04 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 23:27:08 2006 Subject: [Frugalware-darcs] frugalware-current: glib2-2.10.3-1-i686 Message-ID: <20060603212704.A4953FB4019@genesis.frugalware.org> [glib2-2.10.3-1-i686 VMiklos **20060603212627 added chroot-core to groups() ] { hunk ./source/lib/glib2/FrugalBuild 13 -groups=('lib') +groups=('lib' 'chroot-core') } From vmiklos at frugalware.org Sat Jun 3 23:36:22 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 23:36:23 2006 Subject: [Frugalware-darcs] frugalware-current: rp-pppoe-3.8-1-i686 Message-ID: <20060603213622.1E7D0FB4017@genesis.frugalware.org> [rp-pppoe-3.8-1-i686 VMiklos **20060603211646 clean up the old hack (which was necessary to work around a no-longer-existing bug) from rc.adsl ] { hunk ./source/network/rp-pppoe/FrugalBuild 18 - 'e07cdc1d2ab271f3899a162847a5656edc26965c' \ + 'f79284e0beab4d3362c468faead10a43dd71607e' \ hunk ./source/network/rp-pppoe/rc.adsl 14 - if [ -e /var/run/adsl.gw ]; then - route del default gw `cat /var/run/adsl.gw` - rm /var/run/adsl.gw - fi hunk ./source/network/rp-pppoe/rc.adsl 22 - rm -f /var/run/adsl.gw hunk ./source/network/rp-pppoe/rc.adsl 25 - - if [ $retval -eq 0 ] ; then - currentgw=`route -n|grep ppp0|sed 's/[0-9\.]* *\([0-9\.]*\) .*/\1/'|grep -v 0.0.0.0` - necessarygw=`ifconfig ppp0|grep inet|sed 's/ *inet addr:\([0-9\.]*\) *.*/\1/'` - if ! [ "$currentgw" == "$necessarygw" ]; then - route add default gw `pppoe-status |sed -n '3 p'|cut -d : -f 2|cut -d ' ' -f 1` - echo "$necessarygw" >/var/run/adsl.gw - fi - fi } From vmiklos at frugalware.org Sat Jun 3 23:47:10 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Jun 3 23:47:11 2006 Subject: [Frugalware-darcs] frugalwareutils: xconfig: typo fix Message-ID: <20060603214710.03C60FB4019@genesis.frugalware.org> [xconfig: typo fix VMiklos **20060603214317 when the user clicked we assumed he didn't and vica versa.. ;-) ] { hunk ./xconfig/xconfig.c 86 - if(ret) + if(!ret) } From vmiklos at frugalware.org Sun Jun 4 00:03:09 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 00:03:11 2006 Subject: [Frugalware-darcs] frugalware-current: frugalwareutils-0.5.8-3-i686 Message-ID: <20060603220309.42DE9FB4017@genesis.frugalware.org> [frugalwareutils-0.5.8-3-i686 VMiklos **20060603220228 added xconfig.diff from darcs ] { hunk ./source/base/frugalwareutils/FrugalBuild 1 -# Last Modified: Tue, 30 May 2006 03:15:19 +0200 +# Last Modified: Sun, 04 Jun 2006 00:02:01 +0200 hunk ./source/base/frugalwareutils/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/base/frugalwareutils/FrugalBuild 15 -source=($url/$pkgname-$pkgver.tar.gz) -signatures=(${source[0]}.asc) +source=($url/$pkgname-$pkgver.tar.gz xconfig.diff) +signatures=(${source[0]}.asc '') addfile ./source/base/frugalwareutils/xconfig.diff hunk ./source/base/frugalwareutils/xconfig.diff 1 +Sat Jun 3 23:43:17 CEST 2006 VMiklos + * xconfig: typo fix + when the user clicked we assumed he didn't and vica versa.. ;-) +diff -rN -u old-frugalwareutils/xconfig/xconfig.c new-frugalwareutils/xconfig/xconfig.c +--- old-frugalwareutils/xconfig/xconfig.c 2006-06-04 00:00:13.000000000 +0200 ++++ new-frugalwareutils/xconfig/xconfig.c 2006-06-04 00:00:13.000000000 +0200 +@@ -83,7 +83,7 @@ + ret = fwx_dotest(); + init_dialog(input, dialog_state.output); + dialog_backtitle(_("X configuration")); +- if(ret) ++ if(!ret) + break; + } + unlink("/root/xorg.conf.new"); + } From vmiklos at frugalware.org Sun Jun 4 00:25:24 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 00:25:27 2006 Subject: [Frugalware-darcs] frugalware-current: adm8211-20060111-1-i686 Message-ID: <20060603222524.73D2CFB4017@genesis.frugalware.org> [adm8211-20060111-1-i686 VMiklos **20060603222346 new package closes #810 ] { adddir ./extra/source/network/adm8211 addfile ./extra/source/network/adm8211/FrugalBuild hunk ./extra/source/network/adm8211/FrugalBuild 1 +# Last Modified: Sun, 04 Jun 2006 00:22:08 +0200 +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=adm8211 +pkgver=20060111 +pkgrel=1 +pkgdesc="IEEE 802.11 wireless LAN driver for adm8211 based cards" +url="http://aluminum.sourmilk.net/adm8211/" +Finclude kernel-module +groups=('network-extra') +archs=('i686') +up2date="lynx -dump $url|grep bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" +source=($url/$pkgname-$pkgver.tar.bz2) +sha1sums=('69658563c465c5c40d803d528ac3834d81d2cd0a') + +build() +{ + Fcheckkernel + Fcd $pkgname + Fsed '\([^=]\) /lib' "\1 $Fdestdir/lib" Makefile + # we'll do this, dude + Fsed 'depmod' "#depmod" Makefile + Fbuild +} } [adm8211-20060111-1-i686 VMiklos **20060603222453 rebuild.txt ] { hunk ./docs/tech/rebuild.txt 19 +adm8211 } From vmiklos at frugalware.org Sun Jun 4 00:45:33 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 00:45:37 2006 Subject: [Frugalware-darcs] frugalware-current: localepurge-0.5-1-i686 Message-ID: <20060603224533.78CC5FB4017@genesis.frugalware.org> [localepurge-0.5-1-i686 VMiklos **20060603224016 up2date fix ] { hunk ./source/apps/localepurge/FrugalBuild 14 -up2date="lynx -dump http://gentoo.kems.net/gentoo-x86-portage/app-admin/localepurge/?M=D|grep ebuild$|sed -n 's/.*e-\(.*\)\.e.*/\1/;s/-/_/;1 p'" +up2date="lynx -dump http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/|grep localepurge-|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" hunk ./source/apps/localepurge/FrugalBuild 30 -# vim: ft=sh - } From krics at linuxforum.hu Sun Jun 4 00:56:21 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jun 4 00:56:24 2006 Subject: [Frugalware-darcs] frugalware-current: evolution-data-server-1.6.2-1-x86_64 Message-ID: <20060603225621.46768FB4017@genesis.frugalware.org> [evolution-data-server-1.6.2-1-x86_64 Christian Hamar alias krix **20060603225542 * Version bump * Splitted package to $pkgname-ldap - This will drop ~ -6 depends (mysql, etc) for gnome ] { hunk ./source/gnome/evolution-data-server/FrugalBuild 1 -# Last modified: Wed, 12 Apr 2006 13:28:38 +0200 +# Last modified: Sun, 04 Jun 2006 00:25:03 +0200 hunk ./source/gnome/evolution-data-server/FrugalBuild 4 -# Old Maintainer: Laszlo Dvornik hunk ./source/gnome/evolution-data-server/FrugalBuild 6 -pkgver=1.6.1 +pkgver=1.6.2 hunk ./source/gnome/evolution-data-server/FrugalBuild 10 -depends=('nss' 'libsoup' 'libgnomeui' 'openldap>=2.3.13' 'heimdal') -makedepends=('intltool' 'gtk-doc') +depends=('nss' 'libsoup' 'libgnomeui' 'heimdal') +makedepends=('intltool' 'gtk-doc' 'openldap>=2.3.24') hunk ./source/gnome/evolution-data-server/FrugalBuild 16 -sha1sums=('a9a95d61271c966110a5b93a7e7452ebafdad2c8') +sha1sums=('b9bcea4fbcdd0a39cb23e7cd1bc53a59c474a74d') + +subpkgs=('evolution-data-server-ldap') +subdescs=('Evolution Data Server LDAP extensions') +subdepends=('evolution-data-server=1.6.2 openldap>=2.3.24') +subgroups=('gnome') +subarchs=('x86_64 i686') hunk ./source/gnome/evolution-data-server/FrugalBuild 26 - Fbuild --with-openldap=yes --with-nspr-includes=/usr/include/nspr \ + if [ "$CARCH" == "x86_64" ]; then + Fbuild --with-openldap=yes --with-nspr-includes=/usr/include/nspr \ + --with-nss-includes=/usr/include/nss \ + --enable-nntp --enable-smime --enable-ipv6 --disable-debug \ + --with-krb5=/usr + else + Fbuild --with-openldap=yes --with-nspr-includes=/usr/include/nspr \ hunk ./source/gnome/evolution-data-server/FrugalBuild 36 + fi + Fsplit evolution-data-server-ldap /usr/lib/libexchange-storage* + Fsplit evolution-data-server-ldap /usr/lib/evolution-data-server-1.2/extensions/libebookbackendldap* } From krics at linuxforum.hu Sun Jun 4 01:14:42 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jun 4 01:14:46 2006 Subject: [Frugalware-darcs] frugalware-current: gtkhtml-3.10.2-1-x86_64 Message-ID: <20060603231442.A166DFB4019@genesis.frugalware.org> [gtkhtml-3.10.2-1-x86_64 Christian Hamar alias krix **20060603231409 * Version bump ] { hunk ./source/gnome/gtkhtml/FrugalBuild 1 -# Last modified: Wed, 12 Apr 2006 13:46:02 +0200 +# Last modified: Sun, 04 Jun 2006 01:08:45 +0200 hunk ./source/gnome/gtkhtml/FrugalBuild 4 -# Old Maintainer: Laszlo Dvornik hunk ./source/gnome/gtkhtml/FrugalBuild 6 -pkgver=3.10.1 +pkgver=3.10.2 hunk ./source/gnome/gtkhtml/FrugalBuild 15 -sha1sums=('f55ff045ceacc6c40e79da4dfa61b992115c60ff') +sha1sums=('12eefaf2307fe1afb34f84fd2132fc77b239bb1a') } From vmiklos at frugalware.org Sun Jun 4 01:32:35 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 01:32:38 2006 Subject: [Frugalware-darcs] pacman: libalpm: add a missing #include Message-ID: <20060603233235.C3C14FB4017@genesis.frugalware.org> [libalpm: add a missing #include VMiklos **20060603232938 stange it was not needed for krix on x86_64 ] { hunk ./lib/libalpm/be_files.c 31 +#include } From krics at linuxforum.hu Sun Jun 4 02:18:52 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jun 4 02:18:55 2006 Subject: [Frugalware-darcs] frugalware-current: evolution-2.6.2-1-x86_64 Message-ID: <20060604001853.11735FB4017@genesis.frugalware.org> [evolution-2.6.2-1-x86_64 Christian Hamar alias krix **20060604001831 * Version bump ] { hunk ./source/gnome/evolution/FrugalBuild 1 -# Last modified: Thu, 11 May 2006 19:22:04 +0200 +# Last modified: Sun, 04 Jun 2006 02:05:40 +0200 hunk ./source/gnome/evolution/FrugalBuild 7 -pkgver=2.6.1 -pkgrel=2 +pkgver=2.6.2 +pkgrel=1 hunk ./source/gnome/evolution/FrugalBuild 11 -depends=('gal>=2.5.3' 'evolution-data-server>=1.6.1' 'gtkhtml>=3.10.1' 'libgtkhtml' \ - 'gnome-pilot-conduits' 'gnome-spell' 'scrollkeeper' 'heimdal') +depends=('gal>=2.5.3' 'evolution-data-server>=1.6.2' 'gtkhtml>=3.10.2' 'libgtkhtml' \ + 'gnome-pilot-conduits' 'gnome-spell' 'scrollkeeper' 'heimdal' 'evolution-data-server-ldap>=1.6.2') hunk ./source/gnome/evolution/FrugalBuild 17 -sha1sums=('7faad424c0b5b04d5225f3804abe0564276f01d8') +sha1sums=('08a6a9bf3754fff71cbdf82857337b1edc13ef46') } From vmiklos at frugalware.org Sun Jun 4 02:39:50 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 02:39:52 2006 Subject: [Frugalware-darcs] pacman: libalpm: fix a nice segfault in _alpm_db_read() Message-ID: <20060604003950.548CBFB401B@genesis.frugalware.org> [libalpm: fix a nice segfault in _alpm_db_read() VMiklos **20060604003514] { hunk ./lib/libalpm/be_files.c 193 - if(!info->desc_localized->next) { + if(info->desc_localized && !info->desc_localized->next) { } From vmiklos at frugalware.org Sun Jun 4 02:39:50 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 02:39:53 2006 Subject: [Frugalware-darcs] pacman: libalpm: handle properly localized descs in parse_descfile() Message-ID: <20060604003950.184EBFB4017@genesis.frugalware.org> [libalpm: handle properly localized descs in parse_descfile() VMiklos **20060604003541] { hunk ./lib/libalpm/package.c 29 +#include hunk ./lib/libalpm/package.c 208 - STRNCPY(info->desc, ptr, sizeof(info->desc)); + char *lang_tmp; hunk ./lib/libalpm/package.c 210 + asprintf(&lang_tmp, "%s", setlocale(LC_ALL, "")); + if(info->desc_localized && !info->desc_localized->next) { + STRNCPY(info->desc, ptr, sizeof(info->desc)); + } else if (ptr && !strncmp(ptr, lang_tmp, strlen(lang_tmp))) { + STRNCPY(info->desc, ptr+strlen(lang_tmp)+1, sizeof(info->desc)); + } + FREE(lang_tmp); } From vmiklos at frugalware.org Sun Jun 4 03:39:31 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 03:39:33 2006 Subject: [Frugalware-darcs] pacman: scripts/*: pkgdesc_localized/subdescs_localized support Message-ID: <20060604013931.A0054FB4017@genesis.frugalware.org> [scripts/*: pkgdesc_localized/subdescs_localized support VMiklos **20060604013548] { hunk ./scripts/gensync 104 + for it in ${pkgdesc_localized[@]}; do + echo "$it" >>desc + done hunk ./scripts/gensync 222 - unset pkgname pkgver pkgrel pkgdesc force + unset pkgname pkgver pkgrel pkgdesc force pkgdesc_localized hunk ./scripts/gensync 226 - unset subprovides subbackup subinstall suboptions + unset subprovides subbackup subinstall suboptions subdescs_localized hunk ./scripts/gensync 237 - unset pkgdesc groups archs replaces force depends rodepends conflicts provides options + unset pkgdesc groups archs replaces force depends rodepends + unset conflicts provides options pkgdesc_localized hunk ./scripts/gensync 240 + pkgdesc_localized="${subdescs_localized[$i]}" hunk ./scripts/makepkg 377 + for it in "${pkgdesc_localized[@]}"; do + echo "pkgdesc = $it" >>.PKGINFO + done hunk ./scripts/makepkg 661 -unset rodepends options +unset rodepends options pkdesc_localized hunk ./scripts/makepkg 1465 - unset options + unset options pkgdesc_localized hunk ./scripts/makepkg 1467 + pkgdesc_localized="${subdescs_localized[$i]}" hunk ./scripts/updatesync 106 + for it in ${pkgdesc_localized[@]}; do + echo "$it" >>desc + done hunk ./scripts/updatesync 260 - unset pkgname pkgver pkgrel pkgdesc force + unset pkgname pkgver pkgrel pkgdesc force pkgdesc_localized hunk ./scripts/updatesync 264 - unset subprovides subbackup subinstall suboptions + unset subprovides subbackup subinstall suboptions subdescs_localized hunk ./scripts/updatesync 275 - unset pkgdesc groups archs replaces force depends rodepends conflicts provides options + unset pkgdesc groups archs replaces force depends + unset rodepends conflicts provides options pkgdesc_localized hunk ./scripts/updatesync 278 + pkgdesc_localized="${subdescs_localized[$i]}" } From vmiklos at frugalware.org Sun Jun 4 03:42:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 03:42:36 2006 Subject: [Frugalware-darcs] pacman: doc/makepkg.8: note about pkgdesc_localized/subdescs_localized Message-ID: <20060604014234.98873FB4019@genesis.frugalware.org> [doc/makepkg.8: note about pkgdesc_localized/subdescs_localized VMiklos **20060604013938] { hunk ./doc/makepkg.8 238 +.TP +.B pkgdesc_localized +Array of the localized package descriptions. + +The format is the following: +pkgdesc_localized=('xx_YY foo' 'xx_YY bar') + hunk ./doc/makepkg.8 443 +pkgdesc_localized -> subdescs_localized() } From boobaa at frugalware.org Sun Jun 4 07:06:53 2006 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jun 4 07:06:56 2006 Subject: [Frugalware-darcs] frugalware-current: lilypond-2.8.4-1-i686 Message-ID: <20060604050653.F2EC1FB4017@genesis.frugalware.org> [lilypond-2.8.4-1-i686 CSÉCSY László **20060604050501 version bump ] { hunk ./extra/source/apps/lilypond/FrugalBuild 1 -# Last Modified: Thu, 18 May 2006 17:36:56 +0200 +# Last Modified: Sat, 03 Jun 2006 20:09:28 +0200 hunk ./extra/source/apps/lilypond/FrugalBuild 6 -pkgver=2.8.3 +pkgver=2.8.4 hunk ./extra/source/apps/lilypond/FrugalBuild 17 -sha1sums=('5ae355dd8fc0f225abd7dcc9b2ccf502e4b6a965') +sha1sums=('6994d9e3a31a4ec8c90115cde1312fdfe22a2734') } From vmiklos at frugalware.org Sun Jun 4 12:36:25 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 12:36:28 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-nettool-2.14.2-1-i686 Message-ID: <20060604103626.01DD5FB4017@genesis.frugalware.org> [gnome-nettool-2.14.2-1-i686 VMiklos **20060604103521 fix build in chroot ] { hunk ./source/gnome/gnome-nettool/FrugalBuild 1 -# Last modified: Fri, 19 May 2006 01:12:31 +0200 +# Last modified: Sun, 04 Jun 2006 12:34:42 +0200 hunk ./source/gnome/gnome-nettool/FrugalBuild 6 -# NOTE: atm this will be built with makepkg -cL - hunk ./source/gnome/gnome-nettool/FrugalBuild 11 -depends=('libglade' 'gconf' 'net-tools' 'iputils' 'whois' 'traceroute' 'bsd-finger') +depends=('libglade' 'gconf' 'net-tools' 'whois' 'traceroute' 'bsd-finger') +rodepends=('iputils') } From vmiklos at frugalware.org Sun Jun 4 12:57:06 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 12:57:09 2006 Subject: [Frugalware-darcs] frugalware-current: bash-3.1_017-2-i686 Message-ID: <20060604105706.8FB1EFB4017@genesis.frugalware.org> [bash-3.1_017-2-i686 VMiklos **20060604104809 added a simple bashrc, closes #813 ] { hunk ./source/base/bash/FrugalBuild 1 -# Last Modified: Tue, 30 May 2006 23:50:55 +0200 +# Last Modified: Sun, 04 Jun 2006 12:48:00 +0200 hunk ./source/base/bash/FrugalBuild 9 -pkgrel=1 +pkgrel=2 hunk ./source/base/bash/FrugalBuild 12 -backup=(etc/{profile,shells}) +backup=(etc/{profile,shells,skel/.bashrc}) hunk ./source/base/bash/FrugalBuild 17 -source=(ftp://ftp.cwru.edu/pub/$pkgname/$pkgname-$basever.tar.gz profile shells) -signatures=("${source[0]}.sig" '' '') +source=(ftp://ftp.cwru.edu/pub/$pkgname/$pkgname-$basever.tar.gz profile shells bashrc) +signatures=("${source[0]}.sig" '' '' '') hunk ./source/base/bash/FrugalBuild 36 + Ffile bashrc /etc/skel/.bashrc addfile ./source/base/bash/bashrc hunk ./source/base/bash/bashrc 1 +#!/bin/sh + +# if running interactively, then +if [ "$PS1" ]; then + if [ -e /etc/profile ]; then + source /etc/profile + fi + if [ -e ~/.bash_login ]; then + source ~/.bash_login + fi +fi } From vmiklos at frugalware.org Sun Jun 4 13:31:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 13:31:44 2006 Subject: [Frugalware-darcs] frugalware-current: liboil-0.3.9-1-i686 Message-ID: <20060604113142.413A7FB4017@genesis.frugalware.org> [liboil-0.3.9-1-i686 VMiklos **20060604113045 smp fix ] { hunk ./source/lib/liboil/FrugalBuild 1 -# Last modified: Wed, 24 May 2006 20:53:25 +0200 +# Last modified: Sun, 04 Jun 2006 13:10:29 +0200 hunk ./source/lib/liboil/FrugalBuild 19 -build() { - Fbuild --enable-gtk-doc -} - +unset MAKEFLAGS +Fconfopts="$Fconfopts --enable-gtk-doc" } From alex.extreme2 at gmail.com Sun Jun 4 13:53:03 2006 From: alex.extreme2 at gmail.com (alex_extreme) Date: Sun Jun 4 13:53:06 2006 Subject: [Frugalware-darcs] setup: setup: spelling/grammar fixes Message-ID: <20060604115303.4155FFB4017@genesis.frugalware.org> [setup: spelling/grammar fixes alex_extreme **20060604125047] { hunk ./po/de.po 11 -"POT-Creation-Date: 2006-02-28 23:33+0100\n" +"POT-Creation-Date: 2006-06-04 13:50+0100\n" hunk ./po/de.po 23 -#: ../src/plugins/layout.c:114 ../src/plugins/loadsource.c:75 -#: ../src/plugins/select.c:347 ../src/util.c:247 +#: ../src/plugins/layout.c:115 ../src/plugins/loadsource.c:76 +#: ../src/plugins/select.c:350 ../src/util.c:306 hunk ./po/de.po 42 -"schneller herunter zu laden. In den meisten Fällen ist der ausgewählte Mirror " -"in Ordnung." +"schneller herunter zu laden. In den meisten Fällen ist der ausgewählte " +"Mirror in Ordnung." hunk ./po/de.po 46 -#: ../src/plugins/select.c:421 ../src/plugins/select.c:436 +#: ../src/plugins/select.c:417 ../src/plugins/select.c:432 +#: ../src/plugins/select.c:464 hunk ./po/de.po 64 -msgid "Please select which swap partitions do you want Frugalware to use:" +#, fuzzy +msgid "Please select which swap partitions you want Frugalware to use:" hunk ./po/de.po 107 -msgid "Journaling version of the ext2fs filesystem" +#, fuzzy +msgid "Journalising version of the ext2fs filesystem" hunk ./po/de.po 112 -msgid "Hans Reiser's journaling filesystem" +#, fuzzy +msgid "Hans Reiser's journalising filesystem" hunk ./po/de.po 117 -msgid "SGI's journaling filesystem" +#, fuzzy +msgid "SGI's journalising filesystem" hunk ./po/de.po 181 -#: ../src/plugins/formatdisk.c:413 ../src/plugins/formatdisk.c:524 +#: ../src/plugins/formatdisk.c:413 ../src/plugins/formatdisk.c:543 hunk ./po/de.po 191 -#: ../src/plugins/formatdisk.c:497 +#: ../src/plugins/formatdisk.c:516 hunk ./po/de.po 195 -#: ../src/plugins/formatdisk.c:504 ../src/plugins/partdisk.c:139 +#: ../src/plugins/formatdisk.c:523 ../src/plugins/partdisk.c:139 hunk ./po/de.po 199 -#: ../src/plugins/formatdisk.c:508 +#: ../src/plugins/formatdisk.c:527 hunk ./po/de.po 203 -#: ../src/plugins/formatdisk.c:509 +#: ../src/plugins/formatdisk.c:528 hunk ./po/de.po 234 +#, fuzzy hunk ./po/de.po 238 -"The aim of creating Frugalware was to help you make your work faster and " +"The aim of creating Frugalware was to help you to do your work faster and " hunk ./po/de.po 279 -#: ../src/plugins/loadsource.c:122 +#: ../src/plugins/loadsource.c:123 hunk ./po/de.po 283 -#: ../src/plugins/loadsource.c:125 +#: ../src/plugins/loadsource.c:126 hunk ./po/de.po 287 -#: ../src/plugins/loadsource.c:125 +#: ../src/plugins/loadsource.c:126 hunk ./po/de.po 293 -#: ../src/plugins/loadsource.c:135 +#: ../src/plugins/loadsource.c:136 hunk ./po/de.po 297 -#: ../src/plugins/loadsource.c:135 +#: ../src/plugins/loadsource.c:136 hunk ./po/de.po 302 -#: ../src/plugins/loadsource.c:145 +#: ../src/plugins/loadsource.c:156 hunk ./po/de.po 306 -#: ../src/plugins/loadsource.c:145 +#: ../src/plugins/loadsource.c:156 +#, fuzzy hunk ./po/de.po 309 -"Sorry, no Frugalware install disc was found in your drives. Press ENTER to " -"reboot." +"Sorry, no Frugalware install disc was found in any of your drives. Press " +"ENTER to reboot." hunk ./po/de.po 312 -"Entschuldigung, es wurde in Ihren Laufwerken keine Frugalware " -"Installations-Quelle gefunden. Drücken Sie ENTER um neu zu starten." +"Entschuldigung, es wurde in Ihren Laufwerken keine Frugalware Installations-" +"Quelle gefunden. Drücken Sie ENTER um neu zu starten." hunk ./po/de.po 333 -msgid "Select which program do you want to use for partitioning:" +#, fuzzy +msgid "Select the program you want to use for partitioning:" hunk ./po/de.po 352 +#, fuzzy hunk ./po/de.po 354 -"Sorry, no hard disk drives were found in this box. Press ENTER to reboot." +"Sorry, no hard disk drives were found in this computer. Press ENTER to " +"reboot." hunk ./po/de.po 357 -"Entschuldigung, es wurden keine Festplatten gefunden. Drücken Sie ENTER um neu " -"zu starten." +"Entschuldigung, es wurden keine Festplatten gefunden. Drücken Sie ENTER um " +"neu zu starten." hunk ./po/de.po 369 +#, fuzzy hunk ./po/de.po 371 -"Please select a hard disk to partition. The following one are available:" +"Please select a hard disk to partition. The following ones are available:" hunk ./po/de.po 376 -#: ../src/plugins/restart.c:55 ../src/util.c:115 +#: ../src/plugins/restart.c:55 ../src/util.c:123 hunk ./po/de.po 384 -"that %s will make you content. Please remove the media from your drive and " -"press ENTER to reboot." +"that you will enjoy %s. Please remove the media from your drive and press " +"ENTER to reboot." hunk ./po/de.po 388 -"dass %s Sie zufrieden stellt. Bitte entfernen Sie alle Datenträger aus " -"Ihren Laufwerken und drücken ENTER um neu zu starten." +"dass %s Sie zufrieden stellt. Bitte entfernen Sie alle Datenträger aus Ihren " +"Laufwerken und drücken ENTER um neu zu starten." hunk ./po/de.po 391 -#: ../src/plugins/select.c:260 +#: ../src/plugins/select.c:263 hunk ./po/de.po 395 -#: ../src/plugins/select.c:262 +#: ../src/plugins/select.c:265 hunk ./po/de.po 399 -#: ../src/plugins/select.c:263 +#: ../src/plugins/select.c:266 hunk ./po/de.po 404 -#: ../src/plugins/select.c:280 +#: ../src/plugins/select.c:283 hunk ./po/de.po 408 -#: ../src/plugins/select.c:293 +#: ../src/plugins/select.c:296 hunk ./po/de.po 412 -#: ../src/plugins/select.c:294 +#: ../src/plugins/select.c:297 +#, fuzzy hunk ./po/de.po 420 -"functioning of a subsystem. Choose 'no' for using normal menus that select " +"functioning of your system. Choose 'no' for using normal menus that select " hunk ./po/de.po 431 -#: ../src/plugins/select.c:414 +#: ../src/plugins/select.c:410 hunk ./po/de.po 435 -#: ../src/plugins/select.c:417 +#: ../src/plugins/select.c:413 hunk ./po/de.po 439 -#: ../src/plugins/select.c:421 +#: ../src/plugins/select.c:417 hunk ./po/de.po 443 -#: ../src/plugins/select.c:436 +#: ../src/plugins/select.c:432 hunk ./po/de.po 447 -#: ../src/plugins/install.c:89 -#, c-format +#: ../src/plugins/select.c:464 +#, fuzzy +msgid "Searching for missing dependencies..." +msgstr "Suche nach Paketen..." + +#: ../src/plugins/install.c:60 +#, fuzzy, c-format hunk ./po/de.po 455 -"Errors occured while installing selected packages from the %s section.\n" +"Errors occured while installing selected packages.\n" hunk ./po/de.po 458 -"Es traten Fehler während der Installation Ihrer ausgewählten Pakete aus der %s " -"Sektion auf.\n" +"Es traten Fehler während der Installation Ihrer ausgewählten Pakete aus der %" +"s Sektion auf.\n" hunk ./po/de.po 462 -#: ../src/plugins/install.c:136 +#: ../src/plugins/install.c:80 hunk ./po/de.po 466 -#: ../src/plugins/install.c:137 +#: ../src/plugins/install.c:81 hunk ./po/de.po 482 +#, fuzzy hunk ./po/de.po 487 -"machine is on an internet connected lan. Would you like to set a root " +"machine is on an internet connected LAN. Would you like to set a root " hunk ./po/de.po 520 -#: ../src/util.c:44 +#: ../src/util.c:50 hunk ./po/de.po 524 -#: ../src/util.c:57 +#: ../src/util.c:63 hunk ./po/de.po 528 -#: ../src/util.c:115 +#: ../src/util.c:123 hunk ./po/de.po 532 -#: ../src/util.c:149 +#: ../src/util.c:163 hunk ./po/de.po 536 -#: ../src/util.c:150 +#: ../src/util.c:164 hunk ./po/de.po 545 -#: ../src/util.c:166 +#: ../src/util.c:180 hunk ./po/de.po 549 -#: ../src/util.c:167 +#: ../src/util.c:181 hunk ./po/hu.po 10 -"POT-Creation-Date: 2006-05-31 21:45+0200\n" +"POT-Creation-Date: 2006-06-04 13:50+0100\n" hunk ./po/hu.po 61 -msgid "Please select which swap partitions do you want Frugalware to use:" +#, fuzzy +msgid "Please select which swap partitions you want Frugalware to use:" hunk ./po/hu.po 226 +#, fuzzy hunk ./po/hu.po 230 -"The aim of creating Frugalware was to help you make your work faster and " +"The aim of creating Frugalware was to help you to do your work faster and " hunk ./po/hu.po 296 +#, fuzzy hunk ./po/hu.po 298 -"Sorry, no Frugalware install disc was found in your drives. Press ENTER to " -"reboot." +"Sorry, no Frugalware install disc was found in any of your drives. Press " +"ENTER to reboot." hunk ./po/hu.po 339 +#, fuzzy hunk ./po/hu.po 341 -"Sorry, no hard disk drives were found in this box. Press ENTER to reboot." +"Sorry, no hard disk drives were found in this computer. Press ENTER to " +"reboot." hunk ./po/hu.po 366 -#, c-format +#, fuzzy, c-format hunk ./po/hu.po 369 -"that %s will make you content. Please remove the media from your drive and " -"press ENTER to reboot." +"that you will enjoy %s. Please remove the media from your drive and press " +"ENTER to reboot." hunk ./po/hu.po 397 +#, fuzzy hunk ./po/hu.po 404 -"functioning of a subsystem. Choose 'no' for using normal menus that select " +"functioning of your system. Choose 'no' for using normal menus that select " hunk ./po/hu.po 466 +#, fuzzy hunk ./po/hu.po 471 -"machine is on an internet connected lan. Would you like to set a root " +"machine is on an internet connected LAN. Would you like to set a root " hunk ./po/id.po 11 -"POT-Creation-Date: 2006-02-28 23:33+0100\n" +"POT-Creation-Date: 2006-06-04 13:50+0100\n" hunk ./po/id.po 23 -#: ../src/plugins/layout.c:114 ../src/plugins/loadsource.c:75 -#: ../src/plugins/select.c:347 ../src/util.c:247 +#: ../src/plugins/layout.c:115 ../src/plugins/loadsource.c:76 +#: ../src/plugins/select.c:350 ../src/util.c:306 hunk ./po/id.po 40 -msgstr "" -"Sekarang tentukan mirror terdekat untuk mengunduh paket secara cepat." -"Secara umum pilihan awal dapat digunakan." +msgstr "" +"Sekarang tentukan mirror terdekat untuk mengunduh paket secara cepat.Secara " +"umum pilihan awal dapat digunakan." hunk ./po/id.po 45 -#: ../src/plugins/select.c:421 ../src/plugins/select.c:436 +#: ../src/plugins/select.c:417 ../src/plugins/select.c:432 +#: ../src/plugins/select.c:464 hunk ./po/id.po 63 -msgid "Please select which swap partitions do you want Frugalware to use:" +#, fuzzy +msgid "Please select which swap partitions you want Frugalware to use:" hunk ./po/id.po 105 -msgid "Journaling version of the ext2fs filesystem" +#, fuzzy +msgid "Journalising version of the ext2fs filesystem" hunk ./po/id.po 110 -msgid "Hans Reiser's journaling filesystem" +#, fuzzy +msgid "Hans Reiser's journalising filesystem" hunk ./po/id.po 115 -msgid "SGI's journaling filesystem" +#, fuzzy +msgid "SGI's journalising filesystem" hunk ./po/id.po 178 -#: ../src/plugins/formatdisk.c:413 ../src/plugins/formatdisk.c:524 +#: ../src/plugins/formatdisk.c:413 ../src/plugins/formatdisk.c:543 hunk ./po/id.po 188 -#: ../src/plugins/formatdisk.c:497 +#: ../src/plugins/formatdisk.c:516 hunk ./po/id.po 192 -#: ../src/plugins/formatdisk.c:504 ../src/plugins/partdisk.c:139 +#: ../src/plugins/formatdisk.c:523 ../src/plugins/partdisk.c:139 hunk ./po/id.po 196 -#: ../src/plugins/formatdisk.c:508 +#: ../src/plugins/formatdisk.c:527 hunk ./po/id.po 200 -#: ../src/plugins/formatdisk.c:509 +#: ../src/plugins/formatdisk.c:528 hunk ./po/id.po 213 -"memount direktori seperti /boot, /home atau /usr/local pada partisi lain. Anda " -"sebaiknya jangan mencoba untuk memount /usr, /etc, /sbin atau /bin pada partisi " -"tersendiri karena berisi mereka berisi utilitas penting untuk menjalankan sistem " -"dan memount partisi. Dan juga jangan menggunakan lagi partisi yang sudah dimasuki " -"sebelumnya. Pilihlah salah satu partisi yang ada berikut ini, atau jika anda " -"telah selesai, tekan Lanjut." +"memount direktori seperti /boot, /home atau /usr/local pada partisi lain. " +"Anda sebaiknya jangan mencoba untuk memount /usr, /etc, /sbin atau /bin pada " +"partisi tersendiri karena berisi mereka berisi utilitas penting untuk " +"menjalankan sistem dan memount partisi. Dan juga jangan menggunakan lagi " +"partisi yang sudah dimasuki sebelumnya. Pilihlah salah satu partisi yang ada " +"berikut ini, atau jika anda telah selesai, tekan Lanjut." hunk ./po/id.po 230 +#, fuzzy hunk ./po/id.po 234 -"The aim of creating Frugalware was to help you make your work faster and " +"The aim of creating Frugalware was to help you to do your work faster and " hunk ./po/id.po 270 -#: ../src/plugins/loadsource.c:122 +#: ../src/plugins/loadsource.c:123 hunk ./po/id.po 274 -#: ../src/plugins/loadsource.c:125 +#: ../src/plugins/loadsource.c:126 hunk ./po/id.po 278 -#: ../src/plugins/loadsource.c:125 +#: ../src/plugins/loadsource.c:126 hunk ./po/id.po 282 -#: ../src/plugins/loadsource.c:135 +#: ../src/plugins/loadsource.c:136 hunk ./po/id.po 286 -#: ../src/plugins/loadsource.c:135 +#: ../src/plugins/loadsource.c:136 hunk ./po/id.po 291 -#: ../src/plugins/loadsource.c:145 +#: ../src/plugins/loadsource.c:156 hunk ./po/id.po 295 -#: ../src/plugins/loadsource.c:145 +#: ../src/plugins/loadsource.c:156 +#, fuzzy hunk ./po/id.po 298 -"Sorry, no Frugalware install disc was found in your drives. Press ENTER to " -"reboot." +"Sorry, no Frugalware install disc was found in any of your drives. Press " +"ENTER to reboot." hunk ./po/id.po 321 -msgid "Select which program do you want to use for partitioning:" +#, fuzzy +msgid "Select the program you want to use for partitioning:" hunk ./po/id.po 338 -msgid "Sorry, no hard disk drives were found in this box. Press ENTER to reboot." -msgstr "Maaf, tidak ditemukan penggerak cakram keras. Tekan ENTER untuk reboot." +#, fuzzy +msgid "" +"Sorry, no hard disk drives were found in this computer. Press ENTER to " +"reboot." +msgstr "" +"Maaf, tidak ditemukan penggerak cakram keras. Tekan ENTER untuk reboot." hunk ./po/id.po 354 -msgid "Please select a hard disk to partition. The following one are available:" +#, fuzzy +msgid "" +"Please select a hard disk to partition. The following ones are available:" hunk ./po/id.po 359 -#: ../src/plugins/restart.c:55 ../src/util.c:115 +#: ../src/plugins/restart.c:55 ../src/util.c:123 hunk ./po/id.po 364 -#, c-format +#, fuzzy, c-format hunk ./po/id.po 367 -"that %s will make you content. Please remove the media from your drive and " -"press ENTER to reboot." +"that you will enjoy %s. Please remove the media from your drive and press " +"ENTER to reboot." hunk ./po/id.po 374 -#: ../src/plugins/select.c:260 +#: ../src/plugins/select.c:263 hunk ./po/id.po 378 -#: ../src/plugins/select.c:262 +#: ../src/plugins/select.c:265 hunk ./po/id.po 382 -#: ../src/plugins/select.c:263 +#: ../src/plugins/select.c:266 hunk ./po/id.po 386 -#: ../src/plugins/select.c:280 +#: ../src/plugins/select.c:283 hunk ./po/id.po 390 -#: ../src/plugins/select.c:293 +#: ../src/plugins/select.c:296 hunk ./po/id.po 394 -#: ../src/plugins/select.c:294 +#: ../src/plugins/select.c:297 +#, fuzzy hunk ./po/id.po 402 -"functioning of a subsystem. Choose 'no' for using normal menus that select " +"functioning of your system. Choose 'no' for using normal menus that select " hunk ./po/id.po 408 -"menunjukkan 'C libs', 'C compiler', 'C include files', dll setiap paket. Tentunya " -"anda harus tahu apa yang anda lakukan saat menggunakan mode terampil karena bisa " -"terjadi anda terlewatkan paket yang sangat penting terhadap berfungsinya sistem." -"Pilih 'tidak' untuk menggunakan mode biasa yang memilih 'kelompok paket-paket'," -"atau pilih 'ya' untuk mode terampil yang akan memilih satu persatu paket." +"menunjukkan 'C libs', 'C compiler', 'C include files', dll setiap paket. " +"Tentunya anda harus tahu apa yang anda lakukan saat menggunakan mode " +"terampil karena bisa terjadi anda terlewatkan paket yang sangat penting " +"terhadap berfungsinya sistem.Pilih 'tidak' untuk menggunakan mode biasa yang " +"memilih 'kelompok paket-paket',atau pilih 'ya' untuk mode terampil yang akan " +"memilih satu persatu paket." hunk ./po/id.po 415 -#: ../src/plugins/select.c:414 +#: ../src/plugins/select.c:410 hunk ./po/id.po 419 -#: ../src/plugins/select.c:417 +#: ../src/plugins/select.c:413 hunk ./po/id.po 423 -#: ../src/plugins/select.c:421 +#: ../src/plugins/select.c:417 hunk ./po/id.po 427 -#: ../src/plugins/select.c:436 +#: ../src/plugins/select.c:432 hunk ./po/id.po 431 -#: ../src/plugins/install.c:89 -#, c-format +#: ../src/plugins/select.c:464 +#, fuzzy +msgid "Searching for missing dependencies..." +msgstr "Mencari paket-paket..." + +#: ../src/plugins/install.c:60 +#, fuzzy, c-format hunk ./po/id.po 439 -"Errors occured while installing selected packages from the %s section.\n" +"Errors occured while installing selected packages.\n" hunk ./po/id.po 445 -#: ../src/plugins/install.c:136 +#: ../src/plugins/install.c:80 hunk ./po/id.po 449 -#: ../src/plugins/install.c:137 +#: ../src/plugins/install.c:81 hunk ./po/id.po 464 +#, fuzzy hunk ./po/id.po 469 -"machine is on an internet connected lan. Would you like to set a root " +"machine is on an internet connected LAN. Would you like to set a root " hunk ./po/id.po 472 -"Saat ini tidak ada katakunci untuk catatan pada sistem admin (root)" -"Sangat dianjurkan untuk membuat sekarang sehingga nanti akan aktif saat " -"pertama kali reboot. Hal ini sangat penting bagi yang terhubung pada koneksi " +"Saat ini tidak ada katakunci untuk catatan pada sistem admin (root)Sangat " +"dianjurkan untuk membuat sekarang sehingga nanti akan aktif saat pertama " +"kali reboot. Hal ini sangat penting bagi yang terhubung pada koneksi " hunk ./po/id.po 487 -"Saat ini tidak ada catatan pengguna selain root. Sangat dianjurkan " -"untuk membuatnya. Apakah anda akan membuat catatan pengguna biasa " -"sekarang?" +"Saat ini tidak ada catatan pengguna selain root. Sangat dianjurkan untuk " +"membuatnya. Apakah anda akan membuat catatan pengguna biasa sekarang?" hunk ./po/id.po 502 -#: ../src/util.c:44 +#: ../src/util.c:50 hunk ./po/id.po 506 -#: ../src/util.c:57 +#: ../src/util.c:63 hunk ./po/id.po 510 -#: ../src/util.c:115 +#: ../src/util.c:123 hunk ./po/id.po 514 -#: ../src/util.c:149 +#: ../src/util.c:163 hunk ./po/id.po 518 -#: ../src/util.c:150 +#: ../src/util.c:164 hunk ./po/id.po 525 -"membatalkan proses pemasangan, Tetapi anda bisa juga menghiraukan ini." -"Apakah anda ingin meninggalkan proses pemasangan?" +"membatalkan proses pemasangan, Tetapi anda bisa juga menghiraukan ini.Apakah " +"anda ingin meninggalkan proses pemasangan?" hunk ./po/id.po 528 -#: ../src/util.c:166 +#: ../src/util.c:180 hunk ./po/id.po 532 -#: ../src/util.c:167 +#: ../src/util.c:181 hunk ./po/id.po 536 - hunk ./po/nl.po 11 -"POT-Creation-Date: 2006-02-28 23:33+0100\n" +"POT-Creation-Date: 2006-06-04 13:50+0100\n" hunk ./po/nl.po 23 -#: ../src/plugins/layout.c:114 ../src/plugins/loadsource.c:75 -#: ../src/plugins/select.c:347 ../src/util.c:247 +#: ../src/plugins/layout.c:115 ../src/plugins/loadsource.c:76 +#: ../src/plugins/select.c:350 ../src/util.c:306 hunk ./po/nl.po 45 -#: ../src/plugins/select.c:421 ../src/plugins/select.c:436 +#: ../src/plugins/select.c:417 ../src/plugins/select.c:432 +#: ../src/plugins/select.c:464 hunk ./po/nl.po 63 -msgid "Please select which swap partitions do you want Frugalware to use:" +#, fuzzy +msgid "Please select which swap partitions you want Frugalware to use:" hunk ./po/nl.po 105 -msgid "Journaling version of the ext2fs filesystem" +#, fuzzy +msgid "Journalising version of the ext2fs filesystem" hunk ./po/nl.po 110 -msgid "Hans Reiser's journaling filesystem" +#, fuzzy +msgid "Hans Reiser's journalising filesystem" hunk ./po/nl.po 115 -msgid "SGI's journaling filesystem" +#, fuzzy +msgid "SGI's journalising filesystem" hunk ./po/nl.po 179 -#: ../src/plugins/formatdisk.c:413 ../src/plugins/formatdisk.c:524 +#: ../src/plugins/formatdisk.c:413 ../src/plugins/formatdisk.c:543 hunk ./po/nl.po 189 -#: ../src/plugins/formatdisk.c:497 +#: ../src/plugins/formatdisk.c:516 hunk ./po/nl.po 193 -#: ../src/plugins/formatdisk.c:504 ../src/plugins/partdisk.c:139 +#: ../src/plugins/formatdisk.c:523 ../src/plugins/partdisk.c:139 hunk ./po/nl.po 197 -#: ../src/plugins/formatdisk.c:508 +#: ../src/plugins/formatdisk.c:527 hunk ./po/nl.po 201 -#: ../src/plugins/formatdisk.c:509 +#: ../src/plugins/formatdisk.c:528 hunk ./po/nl.po 231 +#, fuzzy hunk ./po/nl.po 235 -"The aim of creating Frugalware was to help you make your work faster and " +"The aim of creating Frugalware was to help you to do your work faster and " hunk ./po/nl.po 275 -#: ../src/plugins/loadsource.c:122 +#: ../src/plugins/loadsource.c:123 hunk ./po/nl.po 279 -#: ../src/plugins/loadsource.c:125 +#: ../src/plugins/loadsource.c:126 hunk ./po/nl.po 283 -#: ../src/plugins/loadsource.c:125 +#: ../src/plugins/loadsource.c:126 hunk ./po/nl.po 288 -#: ../src/plugins/loadsource.c:135 +#: ../src/plugins/loadsource.c:136 hunk ./po/nl.po 292 -#: ../src/plugins/loadsource.c:135 +#: ../src/plugins/loadsource.c:136 hunk ./po/nl.po 297 -#: ../src/plugins/loadsource.c:145 +#: ../src/plugins/loadsource.c:156 hunk ./po/nl.po 301 -#: ../src/plugins/loadsource.c:145 +#: ../src/plugins/loadsource.c:156 +#, fuzzy hunk ./po/nl.po 304 -"Sorry, no Frugalware install disc was found in your drives. Press ENTER to " -"reboot." +"Sorry, no Frugalware install disc was found in any of your drives. Press " +"ENTER to reboot." hunk ./po/nl.po 327 -msgid "Select which program do you want to use for partitioning:" +#, fuzzy +msgid "Select the program you want to use for partitioning:" hunk ./po/nl.po 344 +#, fuzzy hunk ./po/nl.po 346 -"Sorry, no hard disk drives were found in this box. Press ENTER to reboot." +"Sorry, no hard disk drives were found in this computer. Press ENTER to " +"reboot." hunk ./po/nl.po 360 +#, fuzzy hunk ./po/nl.po 362 -"Please select a hard disk to partition. The following one are available:" +"Please select a hard disk to partition. The following ones are available:" hunk ./po/nl.po 366 -#: ../src/plugins/restart.c:55 ../src/util.c:115 +#: ../src/plugins/restart.c:55 ../src/util.c:123 hunk ./po/nl.po 374 -"that %s will make you content. Please remove the media from your drive and " -"press ENTER to reboot." +"that you will enjoy %s. Please remove the media from your drive and press " +"ENTER to reboot." hunk ./po/nl.po 381 -#: ../src/plugins/select.c:260 +#: ../src/plugins/select.c:263 hunk ./po/nl.po 385 -#: ../src/plugins/select.c:262 +#: ../src/plugins/select.c:265 hunk ./po/nl.po 389 -#: ../src/plugins/select.c:263 +#: ../src/plugins/select.c:266 hunk ./po/nl.po 393 -#: ../src/plugins/select.c:280 +#: ../src/plugins/select.c:283 hunk ./po/nl.po 397 -#: ../src/plugins/select.c:293 +#: ../src/plugins/select.c:296 hunk ./po/nl.po 401 -#: ../src/plugins/select.c:294 +#: ../src/plugins/select.c:297 +#, fuzzy hunk ./po/nl.po 409 -"functioning of a subsystem. Choose 'no' for using normal menus that select " +"functioning of your system. Choose 'no' for using normal menus that select " hunk ./po/nl.po 421 -#: ../src/plugins/select.c:414 +#: ../src/plugins/select.c:410 hunk ./po/nl.po 425 -#: ../src/plugins/select.c:417 +#: ../src/plugins/select.c:413 hunk ./po/nl.po 429 -#: ../src/plugins/select.c:421 +#: ../src/plugins/select.c:417 hunk ./po/nl.po 433 -#: ../src/plugins/select.c:436 +#: ../src/plugins/select.c:432 hunk ./po/nl.po 437 -#: ../src/plugins/install.c:89 -#, c-format +#: ../src/plugins/select.c:464 +#, fuzzy +msgid "Searching for missing dependencies..." +msgstr "Zoeken naar pakketten." + +#: ../src/plugins/install.c:60 +#, fuzzy, c-format hunk ./po/nl.po 445 -"Errors occured while installing selected packages from the %s section.\n" +"Errors occured while installing selected packages.\n" hunk ./po/nl.po 452 -#: ../src/plugins/install.c:136 +#: ../src/plugins/install.c:80 hunk ./po/nl.po 456 -#: ../src/plugins/install.c:137 +#: ../src/plugins/install.c:81 hunk ./po/nl.po 472 +#, fuzzy hunk ./po/nl.po 477 -"machine is on an internet connected lan. Would you like to set a root " +"machine is on an internet connected LAN. Would you like to set a root " hunk ./po/nl.po 513 -#: ../src/util.c:44 +#: ../src/util.c:50 hunk ./po/nl.po 517 -#: ../src/util.c:57 +#: ../src/util.c:63 hunk ./po/nl.po 521 -#: ../src/util.c:115 +#: ../src/util.c:123 hunk ./po/nl.po 525 -#: ../src/util.c:149 +#: ../src/util.c:163 hunk ./po/nl.po 529 -#: ../src/util.c:150 +#: ../src/util.c:164 hunk ./po/nl.po 539 -#: ../src/util.c:166 +#: ../src/util.c:180 hunk ./po/nl.po 543 -#: ../src/util.c:167 +#: ../src/util.c:181 hunk ./po/pt.po 5 -"POT-Creation-Date: 2006-02-28 23:33+0100\n" +"POT-Creation-Date: 2006-06-04 13:50+0100\n" hunk ./po/pt.po 18 -#: ../src/plugins/layout.c:114 ../src/plugins/loadsource.c:75 -#: ../src/plugins/select.c:347 ../src/util.c:247 +#: ../src/plugins/layout.c:115 ../src/plugins/loadsource.c:76 +#: ../src/plugins/select.c:350 ../src/util.c:306 hunk ./po/pt.po 41 -#: ../src/plugins/select.c:421 ../src/plugins/select.c:436 +#: ../src/plugins/select.c:417 ../src/plugins/select.c:432 +#: ../src/plugins/select.c:464 hunk ./po/pt.po 59 -msgid "Please select which swap partitions do you want Frugalware to use:" +#, fuzzy +msgid "Please select which swap partitions you want Frugalware to use:" hunk ./po/pt.po 101 -msgid "Journaling version of the ext2fs filesystem" +#, fuzzy +msgid "Journalising version of the ext2fs filesystem" hunk ./po/pt.po 106 -msgid "Hans Reiser's journaling filesystem" +#, fuzzy +msgid "Hans Reiser's journalising filesystem" hunk ./po/pt.po 111 -msgid "SGI's journaling filesystem" +#, fuzzy +msgid "SGI's journalising filesystem" hunk ./po/pt.po 175 -#: ../src/plugins/formatdisk.c:413 ../src/plugins/formatdisk.c:524 +#: ../src/plugins/formatdisk.c:413 ../src/plugins/formatdisk.c:543 hunk ./po/pt.po 185 -#: ../src/plugins/formatdisk.c:497 +#: ../src/plugins/formatdisk.c:516 hunk ./po/pt.po 189 -#: ../src/plugins/formatdisk.c:504 ../src/plugins/partdisk.c:139 +#: ../src/plugins/formatdisk.c:523 ../src/plugins/partdisk.c:139 hunk ./po/pt.po 193 -#: ../src/plugins/formatdisk.c:508 +#: ../src/plugins/formatdisk.c:527 hunk ./po/pt.po 197 -#: ../src/plugins/formatdisk.c:509 +#: ../src/plugins/formatdisk.c:528 hunk ./po/pt.po 227 +#, fuzzy hunk ./po/pt.po 231 -"The aim of creating Frugalware was to help you make your work faster and " +"The aim of creating Frugalware was to help you to do your work faster and " hunk ./po/pt.po 271 -#: ../src/plugins/loadsource.c:122 +#: ../src/plugins/loadsource.c:123 hunk ./po/pt.po 275 -#: ../src/plugins/loadsource.c:125 +#: ../src/plugins/loadsource.c:126 hunk ./po/pt.po 279 -#: ../src/plugins/loadsource.c:125 +#: ../src/plugins/loadsource.c:126 hunk ./po/pt.po 285 -#: ../src/plugins/loadsource.c:135 +#: ../src/plugins/loadsource.c:136 hunk ./po/pt.po 289 -#: ../src/plugins/loadsource.c:135 +#: ../src/plugins/loadsource.c:136 hunk ./po/pt.po 294 -#: ../src/plugins/loadsource.c:145 +#: ../src/plugins/loadsource.c:156 hunk ./po/pt.po 298 -#: ../src/plugins/loadsource.c:145 +#: ../src/plugins/loadsource.c:156 +#, fuzzy hunk ./po/pt.po 301 -"Sorry, no Frugalware install disc was found in your drives. Press ENTER to " -"reboot." +"Sorry, no Frugalware install disc was found in any of your drives. Press " +"ENTER to reboot." hunk ./po/pt.po 324 -msgid "Select which program do you want to use for partitioning:" +#, fuzzy +msgid "Select the program you want to use for partitioning:" hunk ./po/pt.po 342 +#, fuzzy hunk ./po/pt.po 344 -"Sorry, no hard disk drives were found in this box. Press ENTER to reboot." +"Sorry, no hard disk drives were found in this computer. Press ENTER to " +"reboot." hunk ./po/pt.po 359 +#, fuzzy hunk ./po/pt.po 361 -"Please select a hard disk to partition. The following one are available:" +"Please select a hard disk to partition. The following ones are available:" hunk ./po/pt.po 366 -#: ../src/plugins/restart.c:55 ../src/util.c:115 +#: ../src/plugins/restart.c:55 ../src/util.c:123 hunk ./po/pt.po 374 -"that %s will make you content. Please remove the media from your drive and " -"press ENTER to reboot." +"that you will enjoy %s. Please remove the media from your drive and press " +"ENTER to reboot." hunk ./po/pt.po 381 -#: ../src/plugins/select.c:260 +#: ../src/plugins/select.c:263 hunk ./po/pt.po 385 -#: ../src/plugins/select.c:262 +#: ../src/plugins/select.c:265 hunk ./po/pt.po 389 -#: ../src/plugins/select.c:263 +#: ../src/plugins/select.c:266 hunk ./po/pt.po 393 -#: ../src/plugins/select.c:280 +#: ../src/plugins/select.c:283 hunk ./po/pt.po 397 -#: ../src/plugins/select.c:293 +#: ../src/plugins/select.c:296 hunk ./po/pt.po 401 -#: ../src/plugins/select.c:294 +#: ../src/plugins/select.c:297 +#, fuzzy hunk ./po/pt.po 409 -"functioning of a subsystem. Choose 'no' for using normal menus that select " +"functioning of your system. Choose 'no' for using normal menus that select " hunk ./po/pt.po 422 -#: ../src/plugins/select.c:414 +#: ../src/plugins/select.c:410 hunk ./po/pt.po 426 -#: ../src/plugins/select.c:417 +#: ../src/plugins/select.c:413 hunk ./po/pt.po 430 -#: ../src/plugins/select.c:421 +#: ../src/plugins/select.c:417 hunk ./po/pt.po 434 -#: ../src/plugins/select.c:436 +#: ../src/plugins/select.c:432 hunk ./po/pt.po 438 -#: ../src/plugins/install.c:89 -#, c-format +#: ../src/plugins/select.c:464 +#, fuzzy +msgid "Searching for missing dependencies..." +msgstr "A procurar pacotes..." + +#: ../src/plugins/install.c:60 +#, fuzzy, c-format hunk ./po/pt.po 446 -"Errors occured while installing selected packages from the %s section.\n" +"Errors occured while installing selected packages.\n" hunk ./po/pt.po 452 -#: ../src/plugins/install.c:136 +#: ../src/plugins/install.c:80 hunk ./po/pt.po 456 -#: ../src/plugins/install.c:137 +#: ../src/plugins/install.c:81 hunk ./po/pt.po 471 +#, fuzzy hunk ./po/pt.po 476 -"machine is on an internet connected lan. Would you like to set a root " +"machine is on an internet connected LAN. Would you like to set a root " hunk ./po/pt.po 511 -#: ../src/util.c:44 +#: ../src/util.c:50 hunk ./po/pt.po 515 -#: ../src/util.c:57 +#: ../src/util.c:63 hunk ./po/pt.po 519 -#: ../src/util.c:115 +#: ../src/util.c:123 hunk ./po/pt.po 523 -#: ../src/util.c:149 +#: ../src/util.c:163 hunk ./po/pt.po 527 -#: ../src/util.c:150 +#: ../src/util.c:164 hunk ./po/pt.po 537 -#: ../src/util.c:166 +#: ../src/util.c:180 hunk ./po/pt.po 541 -#: ../src/util.c:167 +#: ../src/util.c:181 hunk ./po/pt.po 544 + hunk ./po/setup.pot 11 -"POT-Creation-Date: 2006-05-31 21:45+0200\n" +"POT-Creation-Date: 2006-06-04 13:50+0100\n" hunk ./po/setup.pot 60 -msgid "Please select which swap partitions do you want Frugalware to use:" +msgid "Please select which swap partitions you want Frugalware to use:" hunk ./po/setup.pot 213 -"The aim of creating Frugalware was to help you make your work faster and " +"The aim of creating Frugalware was to help you to do your work faster and " hunk ./po/setup.pot 270 -"Sorry, no Frugalware install disc was found in your drives. Press ENTER to " -"reboot." +"Sorry, no Frugalware install disc was found in any of your drives. Press " +"ENTER to reboot." hunk ./po/setup.pot 308 -"Sorry, no hard disk drives were found in this box. Press ENTER to reboot." +"Sorry, no hard disk drives were found in this computer. Press ENTER to " +"reboot." hunk ./po/setup.pot 333 -"that %s will make you content. Please remove the media from your drive and " -"press ENTER to reboot." +"that you will enjoy %s. Please remove the media from your drive and press " +"ENTER to reboot." hunk ./po/setup.pot 364 -"functioning of a subsystem. Choose 'no' for using normal menus that select " +"functioning of your system. Choose 'no' for using normal menus that select " hunk ./po/setup.pot 416 -"machine is on an internet connected lan. Would you like to set a root " +"machine is on an internet connected LAN. Would you like to set a root " hunk ./src/Makefile 19 -UI ?= dialog +UI ?= gtk hunk ./src/plugins/formatdisk.c 145 - _("Please select which swap partitions do you want Frugalware " + _("Please select which swap partitions you want Frugalware " hunk ./src/plugins/greet.c 59 - "The aim of creating Frugalware was to help you make your work " + "The aim of creating Frugalware was to help you to do your work " hunk ./src/plugins/loadsource.c 156 - dialog_msgbox(_("CD/DVD drive not found"), _("Sorry, no Frugalware install disc was found in your drives. Press ENTER to reboot."), 0, 0, 1); + dialog_msgbox(_("CD/DVD drive not found"), _("Sorry, no Frugalware install disc was found in any of your drives. Press ENTER to reboot."), 0, 0, 1); hunk ./src/plugins/partdisk.c 119 - dialog_msgbox(_("Disk drive not found"), _("Sorry, no hard disk drives were found in this box. Press ENTER to reboot."), 0, 0, 1); + dialog_msgbox(_("Disk drive not found"), _("Sorry, no hard disk drives were found in this computer. Press ENTER to reboot."), 0, 0, 1); hunk ./src/plugins/postconf.c 78 - "an internet connected lan. Would you like to set a root " + "an internet connected LAN. Would you like to set a root " hunk ./src/plugins/restart.c 57 - "hope that %s will make you content. Please remove " + "hope that you will enjoy %s. Please remove " hunk ./src/plugins/select.c 303 - "functioning of a subsystem. Choose 'no' for using normal " + "functioning of your system. Choose 'no' for using normal " } From alex.extreme2 at gmail.com Sun Jun 4 16:07:50 2006 From: alex.extreme2 at gmail.com (alex_extreme) Date: Sun Jun 4 16:07:53 2006 Subject: [Frugalware-darcs] frugalware-current: libdaemon-0.10-1-i686 Message-ID: <20060604140750.3509EFB4017@genesis.frugalware.org> [libdaemon-0.10-1-i686 alex_extreme **20060604150354 * new package needed by Avahi ] { adddir ./source/lib/libdaemon addfile ./source/lib/libdaemon/FrugalBuild hunk ./source/lib/libdaemon/FrugalBuild 1 +# Last Modified: Sun, 04 Jun 2006 16:00:30 +0100 +# Compiling Time: 0.06 SBU +# Maintainer: alex_extreme + +pkgname=libdaemon +pkgver=0.10 +pkgrel=1 +pkgdesc="libdaemon is a lightweight C library that eases the writing of UNIX daemons." +url="http://0pointer.de/lennart/projects/libdaemon/" +depends=('glibc') +groups=('lib') +archs=('i686' 'x86_64') +up2date="lynx -dump http://0pointer.de/lennart/projects/libdaemon | grep 'libdaemon [0-9]' | sed 's/ //g' | sed 's/libdaemon//'" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('2606710f5b130078c313cbdb86765cf2da20c334') + +build() { + Fbuild --disable-doxygen --disable-lynx +} + +# optimization OK } From vmiklos at frugalware.org Sun Jun 4 20:36:08 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 20:36:11 2006 Subject: [Frugalware-darcs] frugalware-current: openoffice.org-2.0.2.999.5-1-x86_64 Message-ID: <20060604183608.EA34AFB4017@genesis.frugalware.org> [openoffice.org-2.0.2.999.5-1-x86_64 VMiklos **20060604183511 add patch>=2.5.9 to makedepends(), remove sed hack ] { hunk ./source/xapps/openoffice.org/FrugalBuild 1 -# Last modified: Sat, 03 Jun 2006 05:16:47 +0200 +# Last modified: Sun, 04 Jun 2006 14:48:09 +0200 hunk ./source/xapps/openoffice.org/FrugalBuild 34 - 'xalan-j') + 'xalan-j' 'patch>=2.5.9') hunk ./source/xapps/openoffice.org/FrugalBuild 159 - sed -i '/^#/d' patches/src680/cws-vgbugs03.diff } From vmiklos at frugalware.org Sun Jun 4 21:39:49 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Jun 4 21:39:51 2006 Subject: [Frugalware-darcs] frugalware-current: lib3ds-1.2.0-1-i686 Message-ID: <20060604193949.0AAE1FB4017@genesis.frugalware.org> [lib3ds-1.2.0-1-i686 VMiklos **20060604193856 added i686 to archs() ] { hunk ./extra/source/lib/lib3ds/FrugalBuild 1 -# Last Modified: Wed, 10 May 2006 15:47:44 +0200 +# Last Modified: Sun, 04 Jun 2006 21:37:08 +0200 hunk ./extra/source/lib/lib3ds/FrugalBuild 9 -url="http://lib3ds.sourceforge.net/" hunk ./extra/source/lib/lib3ds/FrugalBuild 11 -archs=('x86_64') +archs=('i686' 'x86_64') hunk ./extra/source/lib/lib3ds/FrugalBuild 16 - Fcd - sed -i -e "s/@CFLAGS@/@CFLAGS@ -fPIC/" lib3ds/Makefile.in || Fdie + [ "$CARCH" == "x86_64" ] && Fsed "@CFLAGS@" "@CFLAGS@ -fPIC" lib3ds/Makefile.in } From crazy at frugalware.org Sun Jun 4 23:38:00 2006 From: crazy at frugalware.org (crazy) Date: Sun Jun 4 23:38:03 2006 Subject: [Frugalware-darcs] frugalware-current: kdelibs-3.5.3-2-i686 Message-ID: <20060604213800.D9222FB4017@genesis.frugalware.org> [kdelibs-3.5.3-2-i686 crazy **20060604212155 * removed mdsnresponder from depends() because this ''CRAP * NOTE for all Gnome co|mainainer and all other WM(s) m8r: * THIS is the FIRST and LAST time I do remove something from KDE just because 'someone' can't wait with some _optional_ depends() and the FIRST and LAST time _I will_ workaround that. If you want add some new ( optional ) depends() which conflicts with KDE ( and other ) then: 1). _provide TESTED patched_ , tested means patch KDE with those patches _and do run KDE do test_ and NOT for some minutes!!. or 2) provide any other solution and/or package repalces the old one. As a NOTE2 _I do NOT accept "any" experimental patches _NOT_ befor there is a "testing" or DO_NOT_UPDATE_TO_THIS_REPO_IT_WILL_EAT_YOUR_SYSTEM or whatever is called. If you can't or don't want to do this then feel free to add KDE to conflicts() I don't care about. ] { hunk ./extra/source/subpkgs/kdelibs/FrugalBuild 7 -pkgrel=1 +pkgrel=2 hunk ./source/kde/kdelibs/FrugalBuild 1 -# Last modified: Wed, 31 May 2006 14:36:02 +0200 +# Last modified: Sun, 04 Jun 2006 22:39:29 +0200 hunk ./source/kde/kdelibs/FrugalBuild 9 -pkgrel=1 +pkgrel=2 hunk ./source/kde/kdelibs/FrugalBuild 11 -depends=('arts>=1.5.2-1' 'hicolor-icon-theme' 'libxslt' 'pcre' 'lesstif' 'openssl' 'libart_lgpl' 'gamin' 'bzip2' \ - 'xfsprogs-acl' 'openexr' 'libidn' 'aspell' 'dejavu-ttf' 'corefonts' 'jasper' 'aspell6-en' 'mdnsresponder') +depends=('arts>=1.5.3-1' 'hicolor-icon-theme' 'libxslt' 'pcre' 'lesstif' 'openssl' 'libart_lgpl' 'gamin' 'bzip2' \ + 'xfsprogs-acl' 'openexr' 'libidn' 'aspell' 'dejavu-ttf' 'corefonts' 'jasper' 'aspell6-en') } From vmiklos at frugalware.org Mon Jun 5 00:22:17 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 00:22:19 2006 Subject: [Frugalware-darcs] mxw: rss: whitespace fixes Message-ID: <20060604222217.5D414FB4017@genesis.frugalware.org> [rss: whitespace fixes VMiklos **20060604221839] { hunk ./rss.c 16 - ret = mrss_parse_url (rss, &data); + if ((ret=mrss_parse_url(rss, &data))) + { + fprintf (stderr, "MRSS return error: %s\n", mrss_strerror (ret)); + return(1); + } hunk ./rss.c 22 - if (ret) - { - fprintf (stderr, "MRSS return error: %s\n", mrss_strerror (ret)); - return 1; - } - - item = data->item; - while (item) - { - // don't print any item for the first time - if(*lastupd==0) - break; - if(get_date(item->pubDate, NULL)>*lastupd) - { - if(!strcmp(channel, "packages")) - _irc_raw_send(&server0, "PRIVMSG %s :14%s 7%s 3%s\n", target, channel, item->author, item->title); - // blogs and bugs - else - _irc_raw_send(&server0, "PRIVMSG %s :14%s 7%s 3%s\n", target, channel, item->title, item->link); - } - - item = item->next; - } - *lastupd=get_date(data->item->pubDate, NULL); - - mrss_free (data); - - return 0; + item = data->item; + while (item) + { + // don't print any item for the first time + if(*lastupd==0) + break; + if(get_date(item->pubDate, NULL)>*lastupd) + { + if(!strcmp(channel, "packages")) + _irc_raw_send(&server0, "PRIVMSG %s :14%s 7%s 3%s\n", + target, channel, item->author, item->title); + // blogs and bugs + else + _irc_raw_send(&server0, "PRIVMSG %s :14%s 7%s 3%s\n", + target, channel, item->title, item->link); + } + item = item->next; + } + *lastupd=get_date(data->item->pubDate, NULL); + mrss_free (data); + return(0); } From vmiklos at frugalware.org Mon Jun 5 00:22:17 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 00:22:20 2006 Subject: [Frugalware-darcs] mxw: rss: don't print any item for the first time Message-ID: <20060604222217.BFB96FB4017@genesis.frugalware.org> [rss: don't print any item for the first time VMiklos **20060604221523] { hunk ./rss.c 27 + // don't print any item for the first time + if(*lastupd==0) + break; hunk ./rss.c 38 - if(*lastupd==0) - break; } From vmiklos at frugalware.org Mon Jun 5 00:49:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 00:49:37 2006 Subject: [Frugalware-darcs] mxw: opme: don't op on whois if not necessary Message-ID: <20060604224934.AF583FB4017@genesis.frugalware.org> [opme: don't op on whois if not necessary VMiklos **20060604224214] { hunk ./Makefile 30 + +CFLAGS += -Wall $(shell pkg-config --cflags glib-2.0) +LDFLAGS += $(shell pkg-config --libs glib-2.0) hunk ./opme.c 29 +#include hunk ./opme.c 33 +#include "opme.h" hunk ./opme.c 37 +GList *todo=NULL; + hunk ./opme.c 108 + todo_t *t; hunk ./opme.c 120 - content += 5; + if((t = (todo_t *)malloc(sizeof(todo_t))) == NULL) + return; + + t->owner = strdup(from); + t->cmd = g_strdup_printf("MODE %s +o %s", ptr, from); + todo = g_list_append(todo, t); hunk ./opme.c 146 + int i; hunk ./opme.c 155 - _irc_raw_send(&server0, "MODE %s +o %s\n", CHANNEL, nick); + for(i=0;iowner, nick)) + { + _irc_raw_send(&server0, "%s\n", t->cmd); + free(t->owner); + free(t->cmd); + todo = g_list_remove(todo, t); + } + } hunk ./opme.h 1 +typedef struct __todo_t { + char *cmd; + char *owner; +} todo_t; } From vmiklos at frugalware.org Mon Jun 5 00:49:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 00:49:39 2006 Subject: [Frugalware-darcs] mxw: don't autovoice if the user is not idented Message-ID: <20060604224935.159BDFB401B@genesis.frugalware.org> [don't autovoice if the user is not idented VMiklos **20060604224650] { hunk ./opme.c 138 - _irc_raw_send(&server0, "MODE %s +v %s\n", CHANNEL2, from); + todo_t *t; + + if((t = (todo_t *)malloc(sizeof(todo_t))) == NULL) + return; + t->owner = strdup(from); + t->cmd = g_strdup_printf("MODE %s +v %s", CHANNEL2, from); + todo = g_list_append(todo, t); + _irc_raw_send(&server0, "WHOIS %s\n", from); } From vmiklos at frugalware.org Mon Jun 5 00:58:56 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 00:58:58 2006 Subject: [Frugalware-darcs] frugalware-current: boson-0.12-1-i686 Message-ID: <20060604225856.1BF9EFB4017@genesis.frugalware.org> [boson-0.12-1-i686 VMiklos **20060604225742 new package closes #804 NOTE: boson-0.12-gcc41.diff is in svn already ] { adddir ./extra/source/games/boson addfile ./extra/source/games/boson/FrugalBuild hunk ./extra/source/games/boson/FrugalBuild 1 +# Last Modified: Mon, 05 Jun 2006 00:38:39 +0200 +# Compiling Time: 9.66 SBU +# Maintainer: VMiklos + +pkgname=boson +pkgver=0.12 +pkgrel=1 +pkgdesc="An OpenGL real-time strategy game." +_F_sourceforge_ext=".tar.bz2" +depends=('openal' 'mesa' 'kdelibs' 'lib3ds') +makedepends=('cmake') +groups=('games-extra') +archs=('i686') +Finclude sourceforge +source=(${source/boson-/boson-all-} boson-0.12-gcc41.diff) +options=('scriptlet') + +build() +{ + unset MAKEFLAGS + export QTDIR=/usr/lib/qt + export KDEDIR=`kde-config --prefix` + Fcd boson-all-$pkgver + Fpatchall + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=$Fdestdir/usr .. + make || return 1 + make install || return 1 +} +sha1sums=('dc5d94db52933545b2d2ca44ebe62e70e86d084d' \ + '95b2d1612dfc23763ef148e870ac5cdde9624afa') addfile ./extra/source/games/boson/boson-0.12-gcc41.diff hunk ./extra/source/games/boson/boson-0.12-gcc41.diff 1 +--- boson-all-0.12/code/boson/bosonufoglwidget.cpp 2005-09-06 15:45:31.000000000 +0200 ++++ boson-all-0.12/code/boson/bosonufoglwidget.cpp.gcc41 2006-06-04 22:33:01.000000000 +0200 +@@ -35,11 +35,11 @@ + BoUfoRealProfiling() + { + } +- void BoUfoRealProfiling::push(const QString& name) ++ void push(const QString& name) + { + boProfiling->push(name); + } +- void BoUfoRealProfiling::pop() ++ void pop() + { + boProfiling->pop(); + } +--- boson-all-0.12/code/boson/qlistviewitemnumber.cpp.orig 2006-06-04 22:56:40.000000000 +0200 ++++ boson-all-0.12/code/boson/qlistviewitemnumber.cpp 2006-06-04 22:57:11.000000000 +0200 +@@ -51,7 +51,7 @@ + QString QListViewItemNumberPrefix::key(int column, bool ascending) const + { + QString k = QListViewItemNumber::key(column, ascending); +- QRegExp r("^[0-9]+(\.[0-9]+)?"); ++ QRegExp r("^[0-9]+(\\.[0-9]+)?"); + if (r.search(k) >= 0) { + return r.cap(0); + } } From vmiklos at frugalware.org Mon Jun 5 00:58:56 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 00:58:59 2006 Subject: [Frugalware-darcs] mxw: new commands: voiceme, devoiceme Message-ID: <20060604225856.B2669FB401A@genesis.frugalware.org> [new commands: voiceme, devoiceme VMiklos **20060604225609] { hunk ./libmxw.c 178 + else if(!strncmp(content, "voiceme", strlen("voiceme"))) + handle_voiceme(channel, from, content); + else if(!strncmp(content, "devoiceme", strlen("devoiceme"))) + handle_devoiceme(channel, from, content); hunk ./opme.c 129 + +void handle_voiceme(char *channel, char *from, char *content) +{ + char *ptr; + todo_t *t; + + if(channel) + ptr=channel; + else + ptr=from; + if (!checkAuthors(from)) + { + _irc_raw_send(&server0, "PRIVMSG %s :u r t3h w4nn4b3\n", ptr); + return; + } + + if((t = (todo_t *)malloc(sizeof(todo_t))) == NULL) + return; + + t->owner = strdup(from); + t->cmd = g_strdup_printf("MODE %s +v %s", ptr, from); + todo = g_list_append(todo, t); + + _irc_raw_send(&server0, "WHOIS %s\n", from); +} + +void handle_devoiceme(char *channel, char *from, char *content) +{ + char *ptr; + todo_t *t; + + if(channel) + ptr=channel; + else + ptr=from; + if (!checkAuthors(from)) + { + _irc_raw_send(&server0, "PRIVMSG %s :(null)\n", ptr); + return; + } + + if((t = (todo_t *)malloc(sizeof(todo_t))) == NULL) + return; + + t->owner = strdup(from); + t->cmd = g_strdup_printf("MODE %s +v %s", ptr, from); + todo = g_list_append(todo, t); + + _irc_raw_send(&server0, "WHOIS %s\n", from); +} hunk ./opme.h 6 +void handle_voiceme(char *channel, char *from, char *content); +void handle_devoiceme(char *channel, char *from, char *content); } From vmiklos at frugalware.org Mon Jun 5 01:08:24 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 01:08:26 2006 Subject: [Frugalware-darcs] mxw: typo fix in handle_devoiceme() Message-ID: <20060604230824.E9025FB4017@genesis.frugalware.org> [typo fix in handle_devoiceme() VMiklos **20060604230551] { hunk ./opme.c 174 - t->cmd = g_strdup_printf("MODE %s +v %s", ptr, from); + t->cmd = g_strdup_printf("MODE %s -v %s", ptr, from); } From crazy at frugalware.org Mon Jun 5 01:43:41 2006 From: crazy at frugalware.org (crazy) Date: Mon Jun 5 01:43:43 2006 Subject: [Frugalware-darcs] frugalware-current: skim-1.4.5-1-i686 Message-ID: <20060604234341.26DCCFB4017@genesis.frugalware.org> [skim-1.4.5-1-i686 crazy **20060604233939 * Version bump ] { hunk ./source/kde/skim/FrugalBuild 1 -# Last Modified: Fri, 02 Jun 2006 01:01:35 +0200 +# Last Modified: Mon, 05 Jun 2006 01:12:18 +0200 hunk ./source/kde/skim/FrugalBuild 7 -pkgver=1.4.4 -pkgrel=2 +pkgver=1.4.5 +pkgrel=1 hunk ./source/kde/skim/FrugalBuild 19 -sha1sums=('acecc1dd10842fb3549f98a707d93688cf3102a7') +sha1sums=('6e0ec92ab13b4d5b57ad42b34d5223c0d453fdb0') } From vmiklos at frugalware.org Mon Jun 5 01:49:18 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 01:49:19 2006 Subject: [Frugalware-darcs] mxw: new command: kick Message-ID: <20060604234918.B59ADFB4017@genesis.frugalware.org> [new command: kick VMiklos **20060604234600 hmm, do we really need this? ] { hunk ./libmxw.c 182 + else if(!strncmp(content, "kick", strlen("kick"))) + handle_kick(channel, from, content); hunk ./opme.c 179 + +void handle_kick(char *channel, char *from, char *content) +{ + char *who, *why, *ptr; + todo_t *t; + + who = strdup(content+strlen("kick ")); + if((ptr = strstr(who, " "))) + *ptr = '\0'; + + // 3 for the 3 spaces: " kick nick " + why = strdup(content+strlen("kick")+strlen(from)+3); + + if(!channel) + channel=from; + if (!checkAuthors(from)) + { + _irc_raw_send(&server0, "PRIVMSG %s :%s: haha\n", channel, from); + return; + } + + if((t = (todo_t *)malloc(sizeof(todo_t))) == NULL) + return; + + t->owner = strdup(from); + t->cmd = g_strdup_printf("KICK %s %s :%s", channel, who, why); + todo = g_list_append(todo, t); + free(who); + free(why); + + _irc_raw_send(&server0, "WHOIS %s\n", from); +} hunk ./opme.h 8 +void handle_kick(char *channel, char *from, char *content); } From vmiklos at frugalware.org Mon Jun 5 01:58:25 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 01:58:27 2006 Subject: [Frugalware-darcs] mxw: add a custom default message for kick Message-ID: <20060604235825.9D907FB4017@genesis.frugalware.org> [add a custom default message for kick VMiklos **20060604235135] { hunk ./opme.c 190 - why = strdup(content+strlen("kick")+strlen(from)+3); + if(strlen(content)>strlen("kick")+strlen(from)+3) + why = strdup(content+strlen("kick")+strlen(from)+3); + else + why = strdup("can't we all be friends?"); } From vmiklos at frugalware.org Mon Jun 5 02:07:33 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 02:07:35 2006 Subject: [Frugalware-darcs] mxw: s/strlen(from)/strlen(who)/ on kick Message-ID: <20060605000733.372FAFB4018@genesis.frugalware.org> [s/strlen(from)/strlen(who)/ on kick VMiklos **20060605000452] { hunk ./opme.c 189 - // 3 for the 3 spaces: " kick nick " - if(strlen(content)>strlen("kick")+strlen(from)+3) - why = strdup(content+strlen("kick")+strlen(from)+3); + // 2 for the 2 spaces: "kick nick " + if(strlen(content)>strlen("kick")+strlen(who)+2) + why = strdup(content+strlen("kick")+strlen(who)+2); } From crazy at frugalware.org Mon Jun 5 02:07:33 2006 From: crazy at frugalware.org (crazy) Date: Mon Jun 5 02:07:36 2006 Subject: [Frugalware-darcs] frugalware-current: fltk2-r5170-1-i686 Message-ID: <20060605000733.443E5FB401A@genesis.frugalware.org> [fltk2-r5170-1-i686 crazy **20060605000650 * Version bump ] { hunk ./source/xlib/fltk2/FrugalBuild 1 -# Last modified: Sat, 27 May 2006 04:19:14 +0200 +# Last modified: Mon, 05 Jun 2006 02:06:07 +0200 hunk ./source/xlib/fltk2/FrugalBuild 6 -pkgver=r5148 +pkgver=r5170 hunk ./source/xlib/fltk2/FrugalBuild 19 -sha1sums=('c6bdc68bf451a43c3b33dc42fc01ca08adab82f3' \ +sha1sums=('ccbf583a72504074f70b9760ebbaec3388ed04ae' \ hunk ./source/xlib/fltk2/FrugalBuild 23 - } From crazy at frugalware.org Mon Jun 5 02:22:21 2006 From: crazy at frugalware.org (crazy) Date: Mon Jun 5 02:22:23 2006 Subject: [Frugalware-darcs] frugalware-current: geany-0.7-1-i686 Message-ID: <20060605002221.DB4F0FB4017@genesis.frugalware.org> [geany-0.7-1-i686 crazy **20060605002151 * Version bump ] { hunk ./extra/source/xapps/geany/FrugalBuild 1 -# Last Modified: Fri, 26 May 2006 23:50:38 +0200 +# Last Modified: Mon, 05 Jun 2006 02:16:23 +0200 hunk ./extra/source/xapps/geany/FrugalBuild 6 -pkgver=0.6 +pkgver=0.7 hunk ./extra/source/xapps/geany/FrugalBuild 15 -sha1sums=('44c7f897b7ec9c48b46b495371e0d0fbe3559e47') +sha1sums=('ed3d1170a2ec5903dd2c08ad62f4b78e3252d9e3') } From vmiklos at frugalware.org Mon Jun 5 02:29:17 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 02:29:20 2006 Subject: [Frugalware-darcs] mxw: write the "reload done" message to the appropriate channel Message-ID: <20060605002917.A6C68FB4017@genesis.frugalware.org> [write the "reload done" message to the appropriate channel VMiklos **20060605001034] { hunk ./libmxw.c 34 +extern char *reload_chan; hunk ./libmxw.c 174 + { + reload_chan = strdup(channel); hunk ./libmxw.c 177 + } hunk ./libmxw.c 255 - _irc_raw_send(&server0, "privmsg " CHANNEL " :reload done\n"); + { + _irc_raw_send(&server0, "privmsg %s :reload done\n", reload_chan); + free(reload_chan); + } hunk ./mxw.c 33 +char *reload_chan; } From vmiklos at frugalware.org Mon Jun 5 02:29:17 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 02:29:21 2006 Subject: [Frugalware-darcs] mxw: changed quit message Message-ID: <20060605002917.E8B9EFB401A@genesis.frugalware.org> [changed quit message VMiklos **20060605002602 from Remote closed the connection to Client Quit ] { hunk ./libmxw.c 23 +#include hunk ./libmxw.c 48 +void cleanup(int signum) +{ + _irc_raw_send(&server0, "QUIT\n"); + exit(signum); +} + hunk ./libmxw.c 259 + /* set signal handlers */ + signal(SIGINT, cleanup); + signal(SIGTERM, cleanup); + signal(SIGSEGV, cleanup); + } From crazy at frugalware.org Mon Jun 5 02:36:05 2006 From: crazy at frugalware.org (crazy) Date: Mon Jun 5 02:36:06 2006 Subject: [Frugalware-darcs] frugalware-current: qgit-1.3-1-i686 Message-ID: <20060605003605.734D3FB4019@genesis.frugalware.org> [qgit-1.3-1-i686 crazy **20060605003425 * Version bump ] { hunk ./extra/source/xapps/qgit/FrugalBuild 1 -# Last Modified: Sun, 30 Apr 2006 19:18:33 +0200 +# Last Modified: Mon, 05 Jun 2006 02:30:15 +0200 hunk ./extra/source/xapps/qgit/FrugalBuild 6 -pkgver=1.2 +pkgver=1.3 hunk ./extra/source/xapps/qgit/FrugalBuild 18 -sha1sums=('0079a8b76e856f74157c67f057273781beb2ce44' \ +sha1sums=('0a5b53961e286c4fb8465de0e3927c6aec35e398' \ } From crazy at frugalware.org Mon Jun 5 02:41:19 2006 From: crazy at frugalware.org (crazy) Date: Mon Jun 5 02:41:21 2006 Subject: [Frugalware-darcs] frugalware-current: libmtp-0.0.7-1-i686 Message-ID: <20060605004119.97C2FFB4017@genesis.frugalware.org> [libmtp-0.0.7-1-i686 crazy **20060605004010 * Version bump ] { hunk ./extra/source/lib/libmtp/FrugalBuild 1 -# Last Modified: Fri, 02 Jun 2006 03:13:19 +0200 +# Last Modified: Mon, 05 Jun 2006 02:39:48 +0200 hunk ./extra/source/lib/libmtp/FrugalBuild 6 -pkgver=0.0.6 +pkgver=0.0.7 hunk ./extra/source/lib/libmtp/FrugalBuild 14 -sha1sums=('b0cf9e3071081fb6337191b1482d0f61867754dc') +sha1sums=('3db3c9ed2f93ac64e9bdacb4114202c484438f79') } From vmiklos at frugalware.org Mon Jun 5 02:48:12 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 02:48:14 2006 Subject: [Frugalware-darcs] mxw: handle CHANNEL3 Message-ID: <20060605004812.CF280FB4019@genesis.frugalware.org> [handle CHANNEL3 VMiklos **20060605004318 needed for #frugalware.hu ] { hunk ./config.h.sample 10 +#define CHANNEL3 "#yourchan3" hunk ./libmxw.c 237 + _irc_raw_send(&server0, "join " CHANNEL3 "\n"); } From crazy at frugalware.org Mon Jun 5 02:55:55 2006 From: crazy at frugalware.org (crazy) Date: Mon Jun 5 02:55:57 2006 Subject: [Frugalware-darcs] frugalware-current: popt-1.7-3-i686 Message-ID: <20060605005555.57A05FB4017@genesis.frugalware.org> [popt-1.7-3-i686 crazy **20060605005439 * up2date() | source() fix ] { hunk ./source/lib/popt/FrugalBuild 14 -up2date="wget --passive-ftp -O - -q ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ |grep popt |grep tar.gz |tail -n 1|cut -d '>' -f 2|cut -d '<' -f 1|sed 's/.tar.gz//'|cut -d - -f 2" -source=(ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/$pkgname-$pkgver.tar.gz) +up2date="lynx -dump ftp://jbj.org/pub/rpm-4.4.x|grep 'tar.gz'|grep 'popt-'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" +source=(ftp://jbj.org/pub/rpm-4.4.x/$pkgname-$pkgver.tar.gz) } From vmiklos at frugalware.org Mon Jun 5 03:28:16 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Jun 5 03:28:18 2006 Subject: [Frugalware-darcs] setup: po/hu.po: update Message-ID: <20060605012816.BE9EBFB4017@genesis.frugalware.org> [po/hu.po: update VMiklos **20060605012513] { hunk ./po/hu.po 1 +# translation of hu.po to Hungarian hunk ./po/hu.po 5 -# Laszlo Dvornik , 2005. hunk ./po/hu.po 6 +# Laszlo Dvornik , 2005. +# Miklos Vajna , 2006. hunk ./po/hu.po 10 -"Project-Id-Version: setup\n" +"Project-Id-Version: hu\n" hunk ./po/hu.po 13 -"PO-Revision-Date: 2005-11-27 22:25+0100\n" -"Last-Translator: Laszlo Dvornik \n" -"Language-Team: Hungarian \n" +"PO-Revision-Date: 2006-06-05 03:16+0200\n" +"Last-Translator: Miklos Vajna \n" +"Language-Team: Hungarian \n" hunk ./po/hu.po 19 +"X-Generator: KBabel 1.11.2\n" hunk ./po/hu.po 64 -#, fuzzy hunk ./po/hu.po 228 -#, fuzzy hunk ./po/hu.po 297 -#, fuzzy hunk ./po/hu.po 301 -"Sajnos nem található Frugalware telepítőlemez a meghajtókban. Üssön ENTER-t " +"Sajnos egyik meghajtóban sem található Frugalware telepítőlemez. Üssön ENTER-t " hunk ./po/hu.po 322 -msgstr "" -"Válassza ki, hogy melyik programot kívánja használni a particionáláshoz:" +msgstr "Válassza ki, hogy melyik programot kívánja használni a particionáláshoz:" hunk ./po/hu.po 330 -msgstr "" -"Létre szeretne hozni szoftveres RAID partíciókat a particionálás során?" +msgstr "Létre szeretne hozni szo