[PATCH setup 0/2] Patches to build on cygwin x86_64
A couple of small patches I needed to build natively on cygwin x86_64 from a fresh checkout Jon TURNEY (2): Update boostrap.sh to check for x86_64 compiler also Update libgeopt++/configure.ac for aclocal-1.13 bootstrap.sh | 4 +++- libgetopt++/configure.ac | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) -- 1.8.3.1
[PATCH setup 1/2] Update boostrap.sh to check for x86_64 compiler also
2013-07-24 Jon TURNEY jon.tur...@dronecode.org.uk * bootstrap.sh : Add support for x86_64-w64-mingw32 toolchain. --- bootstrap.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 1c28f49..f21206d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -55,8 +55,10 @@ if hash i686-w64-mingw32-g++ 2 /dev/null; then host=i686-w64-mingw32 elif hash i686-pc-mingw32-g++ 2 /dev/null; then host=i686-pc-mingw32 +elif hash x86_64-w64-mingw32-g++ 2 /dev/null; then + host=x86_64-w64-mingw32 else - echo mingw32-target g++ required for building setup + echo mingw32 or mingw64 target g++ required for building setup exit 1 fi -- 1.8.3.1
[PATCH setup 2/2] Update libgeopt++/configure.ac for aclocal-1.13
configure.ac:14: error: 'AM_CONFIG_HEADER': this macro is obsolete. You should use the 'AC_CONFIG_HEADERS' macro instead. /usr/share/aclocal-1.13/obsolete-err.m4:12: AM_CONFIG_HEADER is expanded from... configure.ac:14: the top level 2013-07-24 Jon TURNEY jon.tur...@dronecode.org.uk * configure.ac: Update for aclocal-1.13 --- libgetopt++/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgetopt++/configure.ac b/libgetopt++/configure.ac index 1ab86fb..a29a1fb 100644 --- a/libgetopt++/configure.ac +++ b/libgetopt++/configure.ac @@ -11,7 +11,7 @@ AC_INIT(src/GetOption.cc, 0.0.2-DEVEL) AC_PREREQ(2.60) AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE -AM_CONFIG_HEADER(include/autoconf.h) +AC_CONFIG_HEADERS(include/autoconf.h) AC_REVISION($Revision: 1.8 $)dnl AC_PREFIX_DEFAULT(/usr/local) AM_MAINTAINER_MODE -- 1.8.3.1
Re: [RFC] cygport: PKG_OBSOLETES
On 7/23/2013 13:11, Yaakov (Cygwin/X) wrote:
But libexpat1-devel is a BAD choice of name,
You're only having a problem with -devel, right, not the library package
proper?
Does this .cygport file solve the problem?
DESCRIPTION=Expat XML parser library
HOMEPAGE=http://expat.sourceforge.net/;
SRC_URI=mirror://sourceforge/${PN}/${P}.tar.gz
abi=1
PKG_NAMES=${PN} lib${PN}${abi} lib${PN}-devel
PKG_HINTS=setup lib${abi} devel
PKG_CONTENTS[0]='usr/bin/*.exe usr/share/'
PKG_CONTENTS[1]=usr/bin/*-${abi}.dll
PKG_CONTENTS[2]='usr/include/ usr/lib/'
CYGCONF_ARGS=--enable-static
DIFF_EXCLUDES=expat_config.h.in
HTMLDOCS=doc/*.png doc/*.html doc/*.css
The only change from the one I used to build the -2 package is that the
PKG_NAMES line used to be:
PKG_NAMES=${PN} lib${PN}${abi} lib${PN}${abi}-devel
It's probably best to just rename this stuff in the repo. The last
release of Expat was 6 years ago, and I have no information that leads
me to expect another release soon. If there were an imminent release
due, I'd say hold off, and let me roll the change into that version.
Anyway, I've changed my local .cygport file as above, in case I ever
have to use it again. :)
Re: Collisions between binutils and gdb
On Jul 23 14:25, Yaakov (Cygwin/X) wrote: On x86, both binutils and gdb provide the BFD headers, but only the former provides the libs. On x86_64, both binutils and gdb provides the BFD headers *and* libs. AFAIK these should *only* be provided by binutils, with the caveat that libiberty needs a patch to install properly per my comments in PR56780. I uploaded a new gdb-7.6-2 package with a new cygport file to ignore the overlapping headers and libs. 64 bit binutils -5 doesn't have the problem from PR56780, and since it's ok in terms of the include and lib files I just kept it that way. Thanks, Corinna -- Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Maintainer cygwin AT cygwin DOT com Red Hat
Re: [RFC] cygport: PKG_OBSOLETES
On Jul 24 03:52, Warren Young wrote:
On 7/23/2013 13:11, Yaakov (Cygwin/X) wrote:
But libexpat1-devel is a BAD choice of name,
You're only having a problem with -devel, right, not the library
package proper?
Does this .cygport file solve the problem?
DESCRIPTION=Expat XML parser library
HOMEPAGE=http://expat.sourceforge.net/;
SRC_URI=mirror://sourceforge/${PN}/${P}.tar.gz
abi=1
PKG_NAMES=${PN} lib${PN}${abi} lib${PN}-devel
PKG_HINTS=setup lib${abi} devel
PKG_CONTENTS[0]='usr/bin/*.exe usr/share/'
PKG_CONTENTS[1]=usr/bin/*-${abi}.dll
PKG_CONTENTS[2]='usr/include/ usr/lib/'
CYGCONF_ARGS=--enable-static
DIFF_EXCLUDES=expat_config.h.in
HTMLDOCS=doc/*.png doc/*.html doc/*.css
The only change from the one I used to build the -2 package is that
the PKG_NAMES line used to be:
PKG_NAMES=${PN} lib${PN}${abi} lib${PN}${abi}-devel
It's probably best to just rename this stuff in the repo. The last
release of Expat was 6 years ago, and I have no information that
leads me to expect another release soon. If there were an imminent
release due, I'd say hold off, and let me roll the change into that
version.
Anyway, I've changed my local .cygport file as above, in case I ever
have to use it again. :)
The problem I see is that we have 16 packages in the 32 bit distro
requiring libexpat1-devel, 2 packages in the 64 bit distro, and 8
packages in the 64 bit distro requiring libexpat-devel.
Regardless of libexpat1-devel supposedly being a bad choice of names,
from the global distro perspective, it would be much easier to remove
the libexpat-devel package from the 64 bit distro and go over the hint
files manually for now.
Otherwise you would have to introduce a new 32 bit package and
get all maintainers to change their dependencies accordingly for the
next package.
Just a thought...
Corinna
--
Corinna Vinschen Please, send mails regarding Cygwin to
Cygwin Maintainer cygwin AT cygwin DOT com
Red Hat
Re: [RFC] cygport: PKG_OBSOLETES
On 7/24/2013 04:06, Corinna Vinschen wrote: Regardless of libexpat1-devel supposedly being a bad choice of names, from the global distro perspective, it would be much easier to remove the libexpat-devel package from the 64 bit distro and go over the hint files manually for now. Doesn't the problem fix itself for those using Cygport's .hint file generation? For those not using this feature, it would be a gentle clue why it's a good idea. You'd have to fake a -3 package set, with libexpat-devel-3 set to obsolete libexpat1-devel-2, so that package developers would automatically get new packages on their next Cygwin update.
[RFU] libargp
Please upload. The previous release can be left in the archive. Thanks, Andrew. # x86 B=http://home.comcast.net/~andrex2/cygwin/x86 wget -x -nH --cut-dirs=3 \ $B/libargp/libargp-20110921-2-src.tar.bz2 \ $B/libargp/libargp-20110921-2.tar.bz2 \ $B/libargp/setup.hint \ $B/libargp/libargp-debuginfo/setup.hint \ $B/libargp/libargp-debuginfo/libargp-debuginfo-20110921-2.tar.bz2 # x86_64 B=http://home.comcast.net/~andrex2/cygwin/x86_64 wget -x -nH --cut-dirs=3 \ $B/libargp/libargp-20110921-2-src.tar.bz2 \ $B/libargp/libargp-20110921-2.tar.bz2 \ $B/libargp/setup.hint \ $B/libargp/libargp-debuginfo/setup.hint \ $B/libargp/libargp-debuginfo/libargp-debuginfo-20110921-2.tar.bz2
Re: [RFC] cygport: PKG_OBSOLETES
On Jul 24 05:12, Warren Young wrote: On 7/24/2013 04:06, Corinna Vinschen wrote: Regardless of libexpat1-devel supposedly being a bad choice of names, from the global distro perspective, it would be much easier to remove the libexpat-devel package from the 64 bit distro and go over the hint files manually for now. Doesn't the problem fix itself for those using Cygport's .hint file generation? For those not using this feature, it would be a gentle clue why it's a good idea. You'd have to fake a -3 package set, with libexpat-devel-3 set to obsolete libexpat1-devel-2, so that package developers would automatically get new packages on their next Cygwin update. If you're willing to do that for 32 and 64 bit, ok. As soon as you do that, we should still change the affected .hint files manually on sware to get the right deps for new installs. Just give the word. Corinna -- Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Maintainer cygwin AT cygwin DOT com Red Hat
Re: [RFU] libargp
On Jul 24 07:26, Andrew Schulman wrote: Please upload. The previous release can be left in the archive. Thanks, Andrew. # x86 B=http://home.comcast.net/~andrex2/cygwin/x86 wget -x -nH --cut-dirs=3 \ $B/libargp/libargp-20110921-2-src.tar.bz2 \ $B/libargp/libargp-20110921-2.tar.bz2 \ $B/libargp/setup.hint \ $B/libargp/libargp-debuginfo/setup.hint \ $B/libargp/libargp-debuginfo/libargp-debuginfo-20110921-2.tar.bz2 # x86_64 B=http://home.comcast.net/~andrex2/cygwin/x86_64 wget -x -nH --cut-dirs=3 \ $B/libargp/libargp-20110921-2-src.tar.bz2 \ $B/libargp/libargp-20110921-2.tar.bz2 \ $B/libargp/setup.hint \ $B/libargp/libargp-debuginfo/setup.hint \ $B/libargp/libargp-debuginfo/libargp-debuginfo-20110921-2.tar.bz2 Uploaded. Thanks, Corinna -- Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Maintainer cygwin AT cygwin DOT com Red Hat
Re: [setup] package re-/de-installation from CLI
On Jul 22 20:02, Achim Gratz wrote: Since the patch from February doesn't apply anymore, I've pulled the patch up to apply to the current CVS head: http://repo.or.cz/w/cygwin-setup.git/patch/858289a3ebe90989e3eca123018aff84ad5f2d50 I've not split the patch into three parts, let me know if you prefer me to do that again. I think that would make sense. I'm, not too sure what exactly you're doing in this patch. It looks a bit intrusive for adding two options. Also, your ChangeLog is incorrectly formatted. Have a look into the existing ChangeLog, please. Can you please attach the patches to your mail then? Thanks, Corinna -- Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Maintainer cygwin AT cygwin DOT com Red Hat
Re: [PATCH setup 0/2] Patches to build on cygwin x86_64
On Jul 24 10:00, Jon TURNEY wrote: A couple of small patches I needed to build natively on cygwin x86_64 from a fresh checkout Please apply. Thanks, Corinna -- Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Maintainer cygwin AT cygwin DOT com Red Hat
Re: Collisions between binutils and gdb
On Jul 24 11:56, Corinna Vinschen wrote: On Jul 23 14:25, Yaakov (Cygwin/X) wrote: On x86, both binutils and gdb provide the BFD headers, but only the former provides the libs. On x86_64, both binutils and gdb provides the BFD headers *and* libs. AFAIK these should *only* be provided by binutils, with the caveat that libiberty needs a patch to install properly per my comments in PR56780. I uploaded a new gdb-7.6-2 package with a new cygport file to ignore the overlapping headers and libs. 64 bit binutils -5 doesn't have the problem from PR56780, and since it's ok in terms of the include and lib files I just kept it that way. Btw., a PING in PR56780 and perhaps on the binutils list may be prudent. There wasn't much of a reaction on your comment... Corinna -- Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Maintainer cygwin AT cygwin DOT com Red Hat
Re: [RFC] cygport: PKG_OBSOLETES
On 7/24/2013 05:41, Corinna Vinschen wrote: On Jul 24 05:12, Warren Young wrote: You'd have to fake a -3 package set, with libexpat-devel-3 set to obsolete libexpat1-devel-2, so that package developers would automatically get new packages on their next Cygwin update. If you're willing to do that for 32 and 64 bit, ok. I don't see what you need from me. Can't you just copy *-2* to *-3* except for libexpat1-devel*-2* which becomes libexpat-devel*-3*, then manually change all the *.hint files referencing libexpat1-devel? I mean, if I rebuild my packages here using the new .cygport file I posted, aren't I going to get exactly the same output tarballs as before, just with different names?
Re: [PATCH 0/4 setup] package re-/de-installation from CLI
Corinna Vinschen writes: I think that would make sense. I'm, not too sure what exactly you're doing in this patch. I hope it is a bit more clear now, otherwise just ask (or consult the thread from February). It looks a bit intrusive for adding two options. Four, actually. I've split out the last two again into the last patch of the series since Chris only really said he wanted the first two. The rest of the apparent intrusiveness really comes about because the function that does the work has been re-implemented to use a higher-level interface to the package DB. There were lots of corner cases and latent bugs with using the low-level interfaces that would have needed cleanup otherwise. Also, your ChangeLog is incorrectly formatted. Have a look into the existing ChangeLog, please. I hope I matched it better this time. Can you please attach the patches to your mail then? See the follow-ups. Regards, Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ Wavetables for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldUserWavetables
Re: [PATCH 1/4 setup] package re-/de-installation from CLI
From 1686e0beac98867bf1fe358a8fe9a9d8647d4a3a Mon Sep 17 00:00:00 2001
From: Achim Gratz strom...@stromeko.de
Date: Fri, 8 Feb 2013 20:58:20 +0100
Subject: [PATCH 1/4] Remove detrimental initialization
* choose.cc (createListview): Remove superflous and detrimental
default trust setting. This has already been set correctly
in OnInit.
---
choose.cc | 5 -
1 file changed, 5 deletions(-)
diff --git a/choose.cc b/choose.cc
index 6d5f3b7..4e0bcd4 100644
--- a/choose.cc
+++ b/choose.cc
@@ -148,11 +148,6 @@ ChooserPage::createListview ()
log (LOG_BABBLE) Failed to set View button caption %ld
GetLastError () endLog;
- for (packagedb::packagecollection::iterator i = db.packages.begin(); i != db.packages.end(); i++)
-{
- i-second-set_requirements(chooser-deftrust);
-}
-
/* FIXME: do we need to init the desired fields ? */
static int ta[] = { IDC_CHOOSE_KEEP, IDC_CHOOSE_CURR, IDC_CHOOSE_EXP, 0 };
rbset (GetHWND (), ta, IDC_CHOOSE_CURR);
--
1.8.3.1
Achim.
--
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+
Waldorf MIDI Implementation additional documentation:
http://Synth.Stromeko.net/Downloads.html#WaldorfDocs
Re: [PATCH 4/4 setup] package re-/de-installation from CLI
From 8d0ee8f914e0af9b6af90909e95a0cd6c3f60215 Mon Sep 17 00:00:00 2001 From: Achim Gratz strom...@stromeko.de Date: Wed, 24 Jul 2013 22:14:19 +0200 Subject: [PATCH 4/4] Implement deletion of orphaned packages and upgrading while installing/removing * choose.cc (UpgradeAlsoOption): Add new CLI option -g/--upgrade-also. (CleanOrphansOption): Add new CLI option -o/--delete-orphans. (OnInit): Implement -g/--upgrade-also, considers all installed packages as candidates for upgrades (the default when no CLI package or category options have been given) also when manual additions or removals are requested at the same time. Implement -o/--delete-orphans, considers installed packages that do not exist anymore in the package repositories as candidates for deletion. --- choose.cc | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/choose.cc b/choose.cc index fd75790..0e05796 100644 --- a/choose.cc +++ b/choose.cc @@ -61,6 +61,10 @@ static const char *cvsid = #include UserSettings.h +#include getopt++/BoolOption.h +static BoolOption UpgradeAlsoOption (false, 'g', upgrade-also, also upgrade installed packages); +static BoolOption CleanOrphansOption (false, 'o', delete-orphans, remove orphaned packages); + using namespace std; extern ThreeBarProgressPage Progress; @@ -248,8 +252,8 @@ ChooserPage::OnInit () bool deleted = pkg.isManuallyDeleted(); bool basemisc = (pkg.categories.find (Base) != pkg.categories.end () || pkg.categories.find (Misc) != pkg.categories.end ()); - bool current = pkg.curr; - bool upgrade = wanted || (!pkg.installed basemisc) || !hasManualSelections; + bool current = pkg.curr || CleanOrphansOption; + bool upgrade = wanted || (!pkg.installed basemisc) || UpgradeAlsoOption || !hasManualSelections; bool install = wanted !deleted !pkg.installed; bool reinstall = (wanted || basemisc ) deleted; bool uninstall = !(wanted || basemisc ) deleted; -- 1.8.3.1 Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ Factory and User Sound Singles for Waldorf rackAttack: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
Re: [PATCH 2/4 setup] package re-/de-installation from CLI
From baab3c913d87a06b62dd14c442a15dc8c2aa9361 Mon Sep 17 00:00:00 2001
From: Achim Gratz strom...@stromeko.de
Date: Wed, 24 Jul 2013 22:00:36 +0200
Subject: [PATCH 2/4] Allow deletion of packages and categories from CLI,
re-implement install from CLI
* choose.h (hasManualSelections): Declare new variable.
* choose.cc (OnInit): Re-implement package handling depending on
options given on CLI using package actions instead of
package_meta low-level functions. When no CLI package or
category options have been given, upgrade installed packages.
Do not check for updates when packages are to be added or
removed from the CLI, but this behaviour can be requested with
--upgrade-also. A package that is requested to be removed and
also added at the same time gets re-installed or upgraded (when
version curr != installed). Uninstalled packages in categories
Base or Misc are always selected for installation; installed
packages in these categories are not eligible for deletion and
will be reinstalled or upgraded instead.
* package_meta.h (ismanuallyDeleted): Declare new method.
* package_meta.cc (DeletePackageOption): Add new CLI option
-x/--remove-packages, packages listed here are considered
candidates for deletion.
(DeleteCategoryOption): Add new CLI option
-c/--remove-categories, packages belonging to categories listed
here are considered candidates for deletion.
(hasManualSelections): Additional boolean to record if any
manual installations or deletions have been requested.
(packagemeta::isManuallyDeleted): Implement along the same lines
as isManuallyWanted, but for deletion candidates.
---
choose.cc | 43 ---
choose.h| 1 +
package_meta.cc | 55 +++
package_meta.h | 2 ++
4 files changed, 78 insertions(+), 23 deletions(-)
diff --git a/choose.cc b/choose.cc
index 4e0bcd4..fd75790 100644
--- a/choose.cc
+++ b/choose.cc
@@ -239,31 +239,28 @@ ChooserPage::OnInit ()
packagedb db;
db.setExistence ();
db.fillMissingCategory ();
- bool bCommandLineAddedPackages = db.addCommandLinePackages();
- // in unattended mode, if packages were selected on the command line using the --packages
- // or --categories options, just install those selected packages and don't upgrade all others
- // (we always install all packages in the Base or Misc categories; packages selected on the
- // command line are added to the Base category)
- if ((unattended_mode == unattended) bCommandLineAddedPackages)
-{
- for (packagedb::packagecollection::iterator i = db.packages.begin ();
- i != db.packages.end (); ++i)
-{
- packagemeta pkg = *(i-second);
- if (pkg.installed)
- pkg.desired = pkg.installed;
- else if (pkg.categories.find (Base) != pkg.categories.end ()
- || pkg.categories.find (Misc) != pkg.categories.end ())
-{
- pkg.desired = pkg.trustp(TRUST_CURR);
- pkg.desired.pick(TRUE, pkg);
-}
-}
-}
- else
+ for (packagedb::packagecollection::iterator i = db.packages.begin ();
+ i != db.packages.end (); ++i)
{
- db.defaultTrust (TRUST_CURR);
+ packagemeta pkg = *(i-second);
+ bool wanted= pkg.isManuallyWanted();
+ bool deleted = pkg.isManuallyDeleted();
+ bool basemisc = (pkg.categories.find (Base) != pkg.categories.end ()
+ || pkg.categories.find (Misc) != pkg.categories.end ());
+ bool current = pkg.curr;
+ bool upgrade = wanted || (!pkg.installed basemisc) || !hasManualSelections;
+ bool install = wanted !deleted !pkg.installed;
+ bool reinstall = (wanted || basemisc ) deleted;
+ bool uninstall = !(wanted || basemisc ) deleted;
+ if (install)
+ pkg.set_action( packagemeta::Install_action, pkg.curr );
+ else if (reinstall)
+ pkg.set_action( packagemeta::Reinstall_action, pkg.curr );
+ else if (uninstall)
+ pkg.set_action( packagemeta::Uninstall_action, packageversion() );
+ else
+ pkg.set_action( packagemeta::Default_action, ((upgrade current) ? pkg.curr : pkg.installed) );
}
ClearBusy ();
diff --git a/choose.h b/choose.h
index b24aefc..9dc5882 100644
--- a/choose.h
+++ b/choose.h
@@ -21,6 +21,7 @@
#include package_meta.h
#include PickView.h
+extern bool hasManualSelections;
class ChooserPage:public PropertyPage
{
diff --git a/package_meta.cc b/package_meta.cc
index ee4cb45..ed7a9bf 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -51,8 +51,11 @@ using namespace std;
using namespace std;
+static StringArrayOption DeletePackageOption ('x', remove-packages, Specify packages to uninstall);
+static StringArrayOption DeleteCategoryOption ('c', remove-categories, Specify categories to uninstall);
static StringArrayOption PackageOption ('P', packages, Specify packages to install);
Re: [PATCH 3/4 setup] package re-/de-installation from CLI
From 54eeaaa766876613b39353271c91502c9cd76d52 Mon Sep 17 00:00:00 2001
From: Achim Gratz strom...@stromeko.de
Date: Wed, 24 Jul 2013 22:04:30 +0200
Subject: [PATCH 3/4] Remove unused method packagedb::addCommandLinePackages
* package_db.h (packagedb::addCommandLinePackages): Remove declaration.
* package_db.cc (packagedb::addCommandLinePackages): Remove unused method.
---
package_db.cc | 17 -
package_db.h | 1 -
2 files changed, 18 deletions(-)
diff --git a/package_db.cc b/package_db.cc
index 1da931c..3578033 100644
--- a/package_db.cc
+++ b/package_db.cc
@@ -422,23 +422,6 @@ packagedb::fillMissingCategory ()
}
}
-bool
-packagedb::addCommandLinePackages ()
-{
- bool bReturn = false;
-
- for (packagedb::packagecollection::iterator i = packages.begin(); i != packages.end(); i++)
-{
- if (i-second-isManuallyWanted())
-{
- i-second-addToCategoryBase();
- bReturn = true;
-}
-}
-
- return bReturn;
-}
-
void
packagedb::defaultTrust (trusts trust)
{
diff --git a/package_db.h b/package_db.h
index 63753aa..bc828a1 100644
--- a/package_db.h
+++ b/package_db.h
@@ -70,7 +70,6 @@ public:
PackageDBConnectedIterator connectedBegin();
PackageDBConnectedIterator connectedEnd();
void fillMissingCategory();
- bool addCommandLinePackages();
void defaultTrust (trusts trust);
void markUnVisited();
void setExistence();
--
1.8.3.1
Achim.
--
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+
Factory and User Sound Singles for Waldorf Q+, Q and microQ:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
Re: [PATCH 1/4 setup] package re-/de-installation from CLI
From 1686e0beac98867bf1fe358a8fe9a9d8647d4a3a Mon Sep 17 00:00:00 2001
From: Achim Gratz strom...@stromeko.de
Date: Fri, 8 Feb 2013 20:58:20 +0100
Subject: [PATCH 1/4] Remove detrimental initialization
* choose.cc (createListview): Remove superflous and detrimental
default trust setting. This has already been set correctly
in OnInit.
---
choose.cc | 5 -
1 file changed, 5 deletions(-)
diff --git a/choose.cc b/choose.cc
index 6d5f3b7..4e0bcd4 100644
--- a/choose.cc
+++ b/choose.cc
@@ -148,11 +148,6 @@ ChooserPage::createListview ()
log (LOG_BABBLE) Failed to set View button caption %ld
GetLastError () endLog;
- for (packagedb::packagecollection::iterator i = db.packages.begin(); i != db.packages.end(); i++)
-{
- i-second-set_requirements(chooser-deftrust);
-}
-
/* FIXME: do we need to init the desired fields ? */
static int ta[] = { IDC_CHOOSE_KEEP, IDC_CHOOSE_CURR, IDC_CHOOSE_EXP, 0 };
rbset (GetHWND (), ta, IDC_CHOOSE_CURR);
--
1.8.3.1
Achim.
--
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+
Factory and User Sound Singles for Waldorf Q+, Q and microQ:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
Re: [PATCH 3/4 setup] package re-/de-installation from CLI
From 54eeaaa766876613b39353271c91502c9cd76d52 Mon Sep 17 00:00:00 2001
From: Achim Gratz strom...@stromeko.de
Date: Wed, 24 Jul 2013 22:04:30 +0200
Subject: [PATCH 3/4] Remove unused method packagedb::addCommandLinePackages
* package_db.h (packagedb::addCommandLinePackages): Remove declaration.
* package_db.cc (packagedb::addCommandLinePackages): Remove unused method.
---
package_db.cc | 17 -
package_db.h | 1 -
2 files changed, 18 deletions(-)
diff --git a/package_db.cc b/package_db.cc
index 1da931c..3578033 100644
--- a/package_db.cc
+++ b/package_db.cc
@@ -422,23 +422,6 @@ packagedb::fillMissingCategory ()
}
}
-bool
-packagedb::addCommandLinePackages ()
-{
- bool bReturn = false;
-
- for (packagedb::packagecollection::iterator i = packages.begin(); i != packages.end(); i++)
-{
- if (i-second-isManuallyWanted())
-{
- i-second-addToCategoryBase();
- bReturn = true;
-}
-}
-
- return bReturn;
-}
-
void
packagedb::defaultTrust (trusts trust)
{
diff --git a/package_db.h b/package_db.h
index 63753aa..bc828a1 100644
--- a/package_db.h
+++ b/package_db.h
@@ -70,7 +70,6 @@ public:
PackageDBConnectedIterator connectedBegin();
PackageDBConnectedIterator connectedEnd();
void fillMissingCategory();
- bool addCommandLinePackages();
void defaultTrust (trusts trust);
void markUnVisited();
void setExistence();
--
1.8.3.1
Achim.
--
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+
Waldorf MIDI Implementation additional documentation:
http://Synth.Stromeko.net/Downloads.html#WaldorfDocs
Re: [PATCH 2/4 setup] package re-/de-installation from CLI
From baab3c913d87a06b62dd14c442a15dc8c2aa9361 Mon Sep 17 00:00:00 2001
From: Achim Gratz strom...@stromeko.de
Date: Wed, 24 Jul 2013 22:00:36 +0200
Subject: [PATCH 2/4] Allow deletion of packages and categories from CLI,
re-implement install from CLI
* choose.h (hasManualSelections): Declare new variable.
* choose.cc (OnInit): Re-implement package handling depending on
options given on CLI using package actions instead of
package_meta low-level functions. When no CLI package or
category options have been given, upgrade installed packages.
Do not check for updates when packages are to be added or
removed from the CLI, but this behaviour can be requested with
--upgrade-also. A package that is requested to be removed and
also added at the same time gets re-installed or upgraded (when
version curr != installed). Uninstalled packages in categories
Base or Misc are always selected for installation; installed
packages in these categories are not eligible for deletion and
will be reinstalled or upgraded instead.
* package_meta.h (ismanuallyDeleted): Declare new method.
* package_meta.cc (DeletePackageOption): Add new CLI option
-x/--remove-packages, packages listed here are considered
candidates for deletion.
(DeleteCategoryOption): Add new CLI option
-c/--remove-categories, packages belonging to categories listed
here are considered candidates for deletion.
(hasManualSelections): Additional boolean to record if any
manual installations or deletions have been requested.
(packagemeta::isManuallyDeleted): Implement along the same lines
as isManuallyWanted, but for deletion candidates.
---
choose.cc | 43 ---
choose.h| 1 +
package_meta.cc | 55 +++
package_meta.h | 2 ++
4 files changed, 78 insertions(+), 23 deletions(-)
diff --git a/choose.cc b/choose.cc
index 4e0bcd4..fd75790 100644
--- a/choose.cc
+++ b/choose.cc
@@ -239,31 +239,28 @@ ChooserPage::OnInit ()
packagedb db;
db.setExistence ();
db.fillMissingCategory ();
- bool bCommandLineAddedPackages = db.addCommandLinePackages();
- // in unattended mode, if packages were selected on the command line using the --packages
- // or --categories options, just install those selected packages and don't upgrade all others
- // (we always install all packages in the Base or Misc categories; packages selected on the
- // command line are added to the Base category)
- if ((unattended_mode == unattended) bCommandLineAddedPackages)
-{
- for (packagedb::packagecollection::iterator i = db.packages.begin ();
- i != db.packages.end (); ++i)
-{
- packagemeta pkg = *(i-second);
- if (pkg.installed)
- pkg.desired = pkg.installed;
- else if (pkg.categories.find (Base) != pkg.categories.end ()
- || pkg.categories.find (Misc) != pkg.categories.end ())
-{
- pkg.desired = pkg.trustp(TRUST_CURR);
- pkg.desired.pick(TRUE, pkg);
-}
-}
-}
- else
+ for (packagedb::packagecollection::iterator i = db.packages.begin ();
+ i != db.packages.end (); ++i)
{
- db.defaultTrust (TRUST_CURR);
+ packagemeta pkg = *(i-second);
+ bool wanted= pkg.isManuallyWanted();
+ bool deleted = pkg.isManuallyDeleted();
+ bool basemisc = (pkg.categories.find (Base) != pkg.categories.end ()
+ || pkg.categories.find (Misc) != pkg.categories.end ());
+ bool current = pkg.curr;
+ bool upgrade = wanted || (!pkg.installed basemisc) || !hasManualSelections;
+ bool install = wanted !deleted !pkg.installed;
+ bool reinstall = (wanted || basemisc ) deleted;
+ bool uninstall = !(wanted || basemisc ) deleted;
+ if (install)
+ pkg.set_action( packagemeta::Install_action, pkg.curr );
+ else if (reinstall)
+ pkg.set_action( packagemeta::Reinstall_action, pkg.curr );
+ else if (uninstall)
+ pkg.set_action( packagemeta::Uninstall_action, packageversion() );
+ else
+ pkg.set_action( packagemeta::Default_action, ((upgrade current) ? pkg.curr : pkg.installed) );
}
ClearBusy ();
diff --git a/choose.h b/choose.h
index b24aefc..9dc5882 100644
--- a/choose.h
+++ b/choose.h
@@ -21,6 +21,7 @@
#include package_meta.h
#include PickView.h
+extern bool hasManualSelections;
class ChooserPage:public PropertyPage
{
diff --git a/package_meta.cc b/package_meta.cc
index ee4cb45..ed7a9bf 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -51,8 +51,11 @@ using namespace std;
using namespace std;
+static StringArrayOption DeletePackageOption ('x', remove-packages, Specify packages to uninstall);
+static StringArrayOption DeleteCategoryOption ('c', remove-categories, Specify categories to uninstall);
static StringArrayOption PackageOption ('P', packages, Specify packages to install);
Re: [PATCH 4/4 setup] package re-/de-installation from CLI
From 8d0ee8f914e0af9b6af90909e95a0cd6c3f60215 Mon Sep 17 00:00:00 2001 From: Achim Gratz strom...@stromeko.de Date: Wed, 24 Jul 2013 22:14:19 +0200 Subject: [PATCH 4/4] Implement deletion of orphaned packages and upgrading while installing/removing * choose.cc (UpgradeAlsoOption): Add new CLI option -g/--upgrade-also. (CleanOrphansOption): Add new CLI option -o/--delete-orphans. (OnInit): Implement -g/--upgrade-also, considers all installed packages as candidates for upgrades (the default when no CLI package or category options have been given) also when manual additions or removals are requested at the same time. Implement -o/--delete-orphans, considers installed packages that do not exist anymore in the package repositories as candidates for deletion. --- choose.cc | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/choose.cc b/choose.cc index fd75790..0e05796 100644 --- a/choose.cc +++ b/choose.cc @@ -61,6 +61,10 @@ static const char *cvsid = #include UserSettings.h +#include getopt++/BoolOption.h +static BoolOption UpgradeAlsoOption (false, 'g', upgrade-also, also upgrade installed packages); +static BoolOption CleanOrphansOption (false, 'o', delete-orphans, remove orphaned packages); + using namespace std; extern ThreeBarProgressPage Progress; @@ -248,8 +252,8 @@ ChooserPage::OnInit () bool deleted = pkg.isManuallyDeleted(); bool basemisc = (pkg.categories.find (Base) != pkg.categories.end () || pkg.categories.find (Misc) != pkg.categories.end ()); - bool current = pkg.curr; - bool upgrade = wanted || (!pkg.installed basemisc) || !hasManualSelections; + bool current = pkg.curr || CleanOrphansOption; + bool upgrade = wanted || (!pkg.installed basemisc) || UpgradeAlsoOption || !hasManualSelections; bool install = wanted !deleted !pkg.installed; bool reinstall = (wanted || basemisc ) deleted; bool uninstall = !(wanted || basemisc ) deleted; -- 1.8.3.1 Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ SD adaptation for Waldorf Blofeld V1.15B11: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
[RFU] serf-1.3.0-1
Please remove 0.7.1-2 and leave 1.2.1-1 as prev. You can also delete
the libserf0_1 and libserf0-devel directories.
D=http://home.comcast.net/~david.rothenberger/cygwin/x86
wget -x -nH --cut-dirs=2 \
${D}/serf/libserf1_0/libserf1_0-1.3.0-1.tar.bz2 \
${D}/serf/libserf1_0/setup.hint \
${D}/serf/libserf1-devel/libserf1-devel-1.3.0-1.tar.bz2 \
${D}/serf/libserf1-devel/setup.hint \
${D}/serf/serf-1.3.0-1.tar.bz2 \
${D}/serf/serf-1.3.0-1-src.tar.bz2 \
${D}/serf/setup.hint
D=http://home.comcast.net/~david.rothenberger/cygwin/x86_64
wget -x -nH --cut-dirs=2 \
${D}/serf/libserf1_0/libserf1_0-1.3.0-1.tar.bz2 \
${D}/serf/libserf1_0/setup.hint \
${D}/serf/libserf1-devel/libserf1-devel-1.3.0-1.tar.bz2 \
${D}/serf/libserf1-devel/setup.hint \
${D}/serf/serf-1.3.0-1.tar.bz2 \
${D}/serf/serf-1.3.0-1-src.tar.bz2 \
${D}/serf/setup.hint
--
David Rothenberger daver...@acm.org
aquadextrous, adj.:
Possessing the ability to turn the bathtub faucet on and off
with your toes.
-- Rich Hall, Sniglets
Re: [PATCH 0/4 setup] package re-/de-installation from CLI
Achim Gratz writes: See the follow-ups. Sorry for the double posts. I got an error from my mailer, but then it seems to have delivered the messages anyway while I re-sent the patches. :-( Regards, Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ SD adaptation for Waldorf rackAttack V1.04R1: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
[RFU] subversion-1.8.1-1
Please upload subversion-1.8.0-1 as the new current release. Please
delete 1.8.0-1 and leave 1.7.10-1 as prev.
Thanks!
D=http://home.comcast.net/~david.rothenberger/cygwin/x86
wget -x -nH --cut-dirs=2 \
${D}/subversion/setup.hint \
${D}/subversion/subversion-1.8.1-1-src.tar.bz2 \
${D}/subversion/subversion-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-apache2/setup.hint \
${D}/subversion/subversion-apache2/subversion-apache2-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-debuginfo/setup.hint \
${D}/subversion/subversion-debuginfo/subversion-debuginfo-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-devel/setup.hint \
${D}/subversion/subversion-devel/subversion-devel-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-gnome/setup.hint \
${D}/subversion/subversion-gnome/subversion-gnome-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-perl/setup.hint \
${D}/subversion/subversion-perl/subversion-perl-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-python/setup.hint \
${D}/subversion/subversion-python/subversion-python-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-ruby/setup.hint \
${D}/subversion/subversion-ruby/subversion-ruby-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-tools/setup.hint \
${D}/subversion/subversion-tools/subversion-tools-1.8.1-1.tar.bz2
D=http://home.comcast.net/~david.rothenberger/cygwin/x86_64
wget -x -nH --cut-dirs=2 \
${D}/subversion/setup.hint \
${D}/subversion/subversion-1.8.1-1-src.tar.bz2 \
${D}/subversion/subversion-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-apache2/setup.hint \
${D}/subversion/subversion-apache2/subversion-apache2-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-debuginfo/setup.hint \
${D}/subversion/subversion-debuginfo/subversion-debuginfo-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-devel/setup.hint \
${D}/subversion/subversion-devel/subversion-devel-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-gnome/setup.hint \
${D}/subversion/subversion-gnome/subversion-gnome-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-perl/setup.hint \
${D}/subversion/subversion-perl/subversion-perl-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-python/setup.hint \
${D}/subversion/subversion-python/subversion-python-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-ruby/setup.hint \
${D}/subversion/subversion-ruby/subversion-ruby-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-tools/setup.hint \
${D}/subversion/subversion-tools/subversion-tools-1.8.1-1.tar.bz2
--
David Rothenberger daver...@acm.org
aquadextrous, adj.:
Possessing the ability to turn the bathtub faucet on and off
with your toes.
-- Rich Hall, Sniglets
Re: [PATCH 0/4 setup] package re-/de-installation from CLI
On Wed, Jul 24, 2013 at 10:41:01PM +0200, Achim Gratz wrote: Corinna Vinschen writes: I think that would make sense. I'm, not too sure what exactly you're doing in this patch. I hope it is a bit more clear now, otherwise just ask (or consult the thread from February). Are these all self-contained patches or are they interdependent? cgf
Re: [RFU] serf-1.3.0-1
On 7/24/2013 4:55 PM, David Rothenberger wrote:
Please remove 0.7.1-2 and leave 1.2.1-1 as prev. You can also delete
the libserf0_1 and libserf0-devel directories.
D=http://home.comcast.net/~david.rothenberger/cygwin/x86
wget -x -nH --cut-dirs=2 \
${D}/serf/libserf1_0/libserf1_0-1.3.0-1.tar.bz2 \
${D}/serf/libserf1_0/setup.hint \
${D}/serf/libserf1-devel/libserf1-devel-1.3.0-1.tar.bz2 \
${D}/serf/libserf1-devel/setup.hint \
${D}/serf/serf-1.3.0-1.tar.bz2 \
${D}/serf/serf-1.3.0-1-src.tar.bz2 \
${D}/serf/setup.hint
D=http://home.comcast.net/~david.rothenberger/cygwin/x86_64
wget -x -nH --cut-dirs=2 \
${D}/serf/libserf1_0/libserf1_0-1.3.0-1.tar.bz2 \
${D}/serf/libserf1_0/setup.hint \
${D}/serf/libserf1-devel/libserf1-devel-1.3.0-1.tar.bz2 \
${D}/serf/libserf1-devel/setup.hint \
${D}/serf/serf-1.3.0-1.tar.bz2 \
${D}/serf/serf-1.3.0-1-src.tar.bz2 \
${D}/serf/setup.hint
Done. What about 1.2.0-1 on x86_64? Should that be deleted? And what
about serf-debuginfo on both arches -- no 1.3.0-1? Last question: On
x86 (but not x86_64), you've made libserf1-devel obsolete in favor of
libserf-devel, but there's no libserf-devel package.
Ken
Re: [RFU] subversion-1.8.1-1
On 7/24/2013 4:56 PM, David Rothenberger wrote:
Please upload subversion-1.8.0-1 as the new current release. Please
delete 1.8.0-1 and leave 1.7.10-1 as prev.
Thanks!
D=http://home.comcast.net/~david.rothenberger/cygwin/x86
wget -x -nH --cut-dirs=2 \
${D}/subversion/setup.hint \
${D}/subversion/subversion-1.8.1-1-src.tar.bz2 \
${D}/subversion/subversion-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-apache2/setup.hint \
${D}/subversion/subversion-apache2/subversion-apache2-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-debuginfo/setup.hint \
${D}/subversion/subversion-debuginfo/subversion-debuginfo-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-devel/setup.hint \
${D}/subversion/subversion-devel/subversion-devel-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-gnome/setup.hint \
${D}/subversion/subversion-gnome/subversion-gnome-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-perl/setup.hint \
${D}/subversion/subversion-perl/subversion-perl-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-python/setup.hint \
${D}/subversion/subversion-python/subversion-python-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-ruby/setup.hint \
${D}/subversion/subversion-ruby/subversion-ruby-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-tools/setup.hint \
${D}/subversion/subversion-tools/subversion-tools-1.8.1-1.tar.bz2
D=http://home.comcast.net/~david.rothenberger/cygwin/x86_64
wget -x -nH --cut-dirs=2 \
${D}/subversion/setup.hint \
${D}/subversion/subversion-1.8.1-1-src.tar.bz2 \
${D}/subversion/subversion-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-apache2/setup.hint \
${D}/subversion/subversion-apache2/subversion-apache2-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-debuginfo/setup.hint \
${D}/subversion/subversion-debuginfo/subversion-debuginfo-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-devel/setup.hint \
${D}/subversion/subversion-devel/subversion-devel-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-gnome/setup.hint \
${D}/subversion/subversion-gnome/subversion-gnome-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-perl/setup.hint \
${D}/subversion/subversion-perl/subversion-perl-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-python/setup.hint \
${D}/subversion/subversion-python/subversion-python-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-ruby/setup.hint \
${D}/subversion/subversion-ruby/subversion-ruby-1.8.1-1.tar.bz2 \
${D}/subversion/subversion-tools/setup.hint \
${D}/subversion/subversion-tools/subversion-tools-1.8.1-1.tar.bz2
Done.
Ken
Re: [RFU] serf-1.3.0-1
On 7/24/2013 8:43 PM, Ken Brown wrote:
On 7/24/2013 4:55 PM, David Rothenberger wrote:
Please remove 0.7.1-2 and leave 1.2.1-1 as prev. You can also delete
the libserf0_1 and libserf0-devel directories.
D=http://home.comcast.net/~david.rothenberger/cygwin/x86
wget -x -nH --cut-dirs=2 \
${D}/serf/libserf1_0/libserf1_0-1.3.0-1.tar.bz2 \
${D}/serf/libserf1_0/setup.hint \
${D}/serf/libserf1-devel/libserf1-devel-1.3.0-1.tar.bz2 \
${D}/serf/libserf1-devel/setup.hint \
${D}/serf/serf-1.3.0-1.tar.bz2 \
${D}/serf/serf-1.3.0-1-src.tar.bz2 \
${D}/serf/setup.hint
D=http://home.comcast.net/~david.rothenberger/cygwin/x86_64
wget -x -nH --cut-dirs=2 \
${D}/serf/libserf1_0/libserf1_0-1.3.0-1.tar.bz2 \
${D}/serf/libserf1_0/setup.hint \
${D}/serf/libserf1-devel/libserf1-devel-1.3.0-1.tar.bz2 \
${D}/serf/libserf1-devel/setup.hint \
${D}/serf/serf-1.3.0-1.tar.bz2 \
${D}/serf/serf-1.3.0-1-src.tar.bz2 \
${D}/serf/setup.hint
Done. What about 1.2.0-1 on x86_64? Should that be deleted? And what
about serf-debuginfo on both arches -- no 1.3.0-1? Last question: On
x86 (but not x86_64), you've made libserf1-devel obsolete in favor of
libserf-devel, but there's no libserf-devel package.
I removed that setup.hint to prevent upset errors, and I replaced it
with the setup.hint from x86_64 (after removing libexpat-devel, which
doesn't exist on x86).
Ken
Re: [RFU] serf-1.3.0-1
Ken Brown wrote: Done. Thanks. What about 1.2.0-1 on x86_64? Should that be deleted? Yes, please. And what about serf-debuginfo on both arches -- no 1.3.0-1? Unfortunately, serf switched to SConstruct from autotools for building, and I haven't figured out how to make the debug packages. So no, no serf-debuginfo. Last question: On x86 (but not x86_64), you've made libserf1-devel obsolete in favor of libserf-devel, but there's no libserf-devel package. Oops. That's totally wrong. libserf1-devel should not be obsolete and libserf-devel should be removed. I've attached the correct setup.hint for libserf1-devel. Thanks for catching that! -- David Rothenberger daver...@acm.org Alden's Laws: (1) Giving away baby clothes and furniture is the major cause of pregnancy. (2) Always be backlit. (3) Sit down whenever possible. category: Web Libs Devel requires: crypt libdb4.8-devel libexpat1-devel libgdbm-devel libiconv libserf1_0 libuuid-devel openldap-devel openssl-devel zlib-devel sdesc: High-performance asynchronous HTTP client library (development) ldesc: The serf library is a C-based HTTP client library built upon the Apache Portable Runtime (APR) library. It multiplexes connections, running the read/write communication asynchronously. Memory copies and transformations are kept to a minimum to provide high performance operation. external-source: serf
Re: [RFU] serf-1.3.0-1
On 7/24/2013 9:24 PM, David Rothenberger wrote: Ken Brown wrote: Done. Thanks. What about 1.2.0-1 on x86_64? Should that be deleted? Yes, please. And what about serf-debuginfo on both arches -- no 1.3.0-1? Unfortunately, serf switched to SConstruct from autotools for building, and I haven't figured out how to make the debug packages. So no, no serf-debuginfo. Last question: On x86 (but not x86_64), you've made libserf1-devel obsolete in favor of libserf-devel, but there's no libserf-devel package. Oops. That's totally wrong. libserf1-devel should not be obsolete and libserf-devel should be removed. I've attached the correct setup.hint for libserf1-devel. Thanks for catching that! OK, but you also need to supply a new tarball for libserf1-devel; the one you provided is empty. Ken
Re: [PATCH 0/4 setup] package re-/de-installation from CLI
Christopher Faylor writes: Are these all self-contained patches or are they interdependent? They constitute a series, that's why I originally offered them as a single patch. The split was done for (hopefully) more clarity and separating the last part. The fourth patch could be trivially split to add each of the two options seperately, which would then be independent of each other, but dependent on the second patch being present. Of the latter two options --upgrade-also was briefly the default behaviour of setup.exe, but then changed to the current default after some discussion on the Cygwin ML. Of course this then incensed some folks who preferred the interim default. Since with those other changes it is now painless offer the choice, I thought it should be implemented. The --delete-orphans option (suggestions for a better name are welcome) is useful to bring an installation to a known state after it has languished for some time or when it had been installed in a different state before. In essence it deletes all those packages that it finds installed, but would not be present in a fresh install with the same options. I use this to get rid of manually installed packages on my test machines or to downsize a production installation (from developer install to user install, for instance) without having to completely nuke it and then do a reinstall. Regards, Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ Factory and User Sound Singles for Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
