Two things: 1) Do not commit changes against trunk. A) The email subject lines are totally non-descriptive, reading "[change#] trunk" instead of "[change#] trunk/dports/gnome/libgnomekbd" as it would if the commit was done in that port's directory instead of in trunk. B) Committing a change in trunk means that you commit every single change you have in the ports tree, not just an atomic change against 1 port. (See para 2 below). 2) The log message reads: "Version bump, update SilverCity to 0.9.7 (fixes #11552, thanks ecronin@gizmolabs.org)" So just what in the h___ are all these patch files against libgnomekbd then? I would not be asking this question if these were committed with comments indicating what the changes do or why I should want them. (See para 1.B above). -- Randall Wood rhwood@mac.com "The ball is round. The game lasts ninety minutes. The rest is theory..." On Monday, March 19, 2007, at 09:47AM, <source_changes@macosforge.org> wrote:
Revision: 22929 http://trac.macosforge.org/projects/macports/changeset/22929 Author: dluke@macports.org Date: 2007-03-19 06:43:35 -0700 (Mon, 19 Mar 2007)
Log Message: ----------- Version bump, update SilverCity to 0.9.7 (fixes #11552, thanks ecronin@gizmolabs.org)
Modified Paths: -------------- trunk/dports/devel/silvercity/Portfile
Added Paths: ----------- trunk/dports/gnome/libgnomekbd/files/ trunk/dports/gnome/libgnomekbd/files/patch-gnome-gconf.c trunk/dports/gnome/libgnomekbd/files/patch_gnome-score.c trunk/dports/gnome/libgnomekbd/files/patch_gnome-util.c
Property Changed: ---------------- trunk/
Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326 40426cdb-d25d-4106-b89a-567fc1e9311f:/local/trunk:22799 a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947 d9146071-5dc1-4620-afc7-8ba4e23d31df:/local/trunk:21690 f2dd1c64-7982-4318-98ce-263798263e0a:/local:22994 + 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326 40426cdb-d25d-4106-b89a-567fc1e9311f:/local/trunk:22799 a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946 b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947 d9146071-5dc1-4620-afc7-8ba4e23d31df:/local/trunk:21690 f2dd1c64-7982-4318-98ce-263798263e0a:/local:23080
Modified: trunk/dports/devel/silvercity/Portfile =================================================================== --- trunk/dports/devel/silvercity/Portfile 2007-03-19 13:37:56 UTC (rev 22928) +++ trunk/dports/devel/silvercity/Portfile 2007-03-19 13:43:35 UTC (rev 22929) @@ -4,7 +4,7 @@ PortGroup python24 1.0
name SilverCity -version 0.9.6 +version 0.9.7 categories devel python maintainers dluke@geeklair.net platforms darwin @@ -14,4 +14,4 @@
homepage http://silvercity.sourceforge.net/ master_sites sourceforge:silvercity -checksums md5 65f2fba68f25997d46e234e1d40af304 +checksums md5 4ae4f9691798385dbde3df9cbb228e8c
Added: trunk/dports/gnome/libgnomekbd/files/patch-gnome-gconf.c =================================================================== --- trunk/dports/gnome/libgnomekbd/files/patch-gnome-gconf.c (rev 0) +++ trunk/dports/gnome/libgnomekbd/files/patch-gnome-gconf.c 2007-03-19 13:43:35 UTC (rev 22929) @@ -0,0 +1,19 @@ +--- libgnome/gnome-gconf.c.org 2005-06-12 21:40:22.000000000 +0200 ++++ libgnome/gnome-gconf.c 2005-06-12 21:49:56.000000000 +0200 +@@ -30,7 +30,6 @@ + #define GCONF_ENABLE_INTERNALS + #include <gconf/gconf.h> + #include <gconf/gconf-client.h> +-extern struct poptOption gconf_options[]; + + #include "gnome-i18nP.h" + +@@ -39,6 +38,8 @@ + #include "gnome-gconf.h" + #include "gnome-gconfP.h" + ++extern struct poptOption gconf_options[]; ++ + /** + * gnome_gconf_get_gnome_libs_settings_relative: + * @subkey: key part below the gnome desktop settings directory
Added: trunk/dports/gnome/libgnomekbd/files/patch_gnome-score.c =================================================================== --- trunk/dports/gnome/libgnomekbd/files/patch_gnome-score.c (rev 0) +++ trunk/dports/gnome/libgnomekbd/files/patch_gnome-score.c 2007-03-19 13:43:35 UTC (rev 22929) @@ -0,0 +1,16 @@ +--- libgnome/gnome-score.c.org Sun Nov 23 21:51:54 2003 ++++ libgnome/gnome-score.c Sun Nov 23 21:53:23 2003 +@@ -230,13 +230,6 @@ + gchar *level; + gchar *realname; + gint retval; +-#ifdef HAVE_SETFSGID +- gid_t gid; +- +- gid = getegid (); +- setgid (getgid ()); +- setfsgid (gid); +-#endif + realname = g_strdup (g_get_real_name ()); + if (strlen (realname) == 0) + realname = g_strdup (g_get_user_name ());
Added: trunk/dports/gnome/libgnomekbd/files/patch_gnome-util.c =================================================================== --- trunk/dports/gnome/libgnomekbd/files/patch_gnome-util.c (rev 0) +++ trunk/dports/gnome/libgnomekbd/files/patch_gnome-util.c 2007-03-19 13:43:35 UTC (rev 22929) @@ -0,0 +1,46 @@ +--- libgnome/gnome-util.c.org Fri Sep 17 18:45:43 2004 ++++ libgnome/gnome-util.c Fri Sep 17 18:47:11 2004 +@@ -189,10 +189,11 @@ + void + gnome_unsetenv (const char *name) + { +-#if defined (HAVE_UNSETENV) +- unsetenv (name); +-#else +- extern char **environ; ++#ifdef __APPLE__ ++# include <crt_externs.h> ++# define environ (*_NSGetEnviron()) ++#elif extern char **environ; ++#endif + int i, len; + + len = strlen (name); +@@ -210,7 +211,6 @@ + environ[i] = environ[i + 1]; + i++; + } +-#endif + } + + /** +@@ -225,12 +225,14 @@ + void + gnome_clearenv (void) + { +-#ifdef HAVE_CLEARENV +- clearenv (); +-#else +- extern char **environ; +- environ[0] = NULL; ++ ++#ifdef __APPLE__ ++# include <crt_externs.h> ++# define environ (*_NSGetEnviron()) ++#elif extern char **environ; + #endif ++ ++ environ[0] = NULL; + } + +
On Mar 19, 2007, at 12:25 PM, Randall Wood wrote:
1) Do not commit changes against trunk.
you're confused (and so am I). I use svk, it has improved merge support and adds the svk:merge property on trunk/ when I merge things in.
A) The email subject lines are totally non-descriptive, reading "[change#] trunk" instead of "[change#] trunk/dports/gnome/ libgnomekbd" as it would if the commit was done in that port's directory instead of in trunk.
Indeed, but that's a bug/feature of SVN::Notify.
B) Committing a change in trunk means that you commit every single change you have in the ports tree, not just an atomic change against 1 port. (See para 2 below).
Not necessarily (and I actually committed this change from within the SilverCity port directory and I thought that svk only listed my change to the Portfile).
2) The log message reads: "Version bump, update SilverCity to 0.9.7 (fixes #11552, thanks ecronin@gizmolabs.org)" So just what in the h___ are all these patch files against libgnomekbd then? I would not be asking this question if these were committed with comments indicating what the changes do or why I should want them. (See para 1.B above).
I'm not sure why svk decided to add those files (I haven't done any work on any gnome ports). I have no idea where they came from either (are they perhaps old patch files that for some reason svk decided to resurrect?). I'm sorry I somehow mistakenly added these files to your port, (fortunately they don't really do anything as there's not a patchfiles line in the Portfile) I'll remove them. -- Daniel J. Luke +========================================================+ | *---------------- dluke@geeklair.net ----------------* | | *-------------- http://www.geeklair.net -------------* | +========================================================+ | Opinions expressed are mine and do not necessarily | | reflect the opinions of my employer. | +========================================================+
participants (2)
-
Daniel J. Luke
-
Randall Wood