[SCM] jackeq/master.stable: Revert "debian/patches/03-pathmax.patch", prepare a translation-update-only upload.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Nov 19 08:57:50 UTC 2010


The following commit has been merged in the master.stable branch:
commit 35ed1e6f751e134fda0f5477a612f189f3501d75
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Nov 19 09:57:24 2010 +0100

    Revert "debian/patches/03-pathmax.patch", prepare a translation-update-only upload.
    
    This reverts commit e55652d36ca9d5f11eda224358f128d36828c134.

diff --git a/debian/patches/03-pathmax.patch b/debian/patches/03-pathmax.patch
deleted file mode 100644
index 238641c..0000000
--- a/debian/patches/03-pathmax.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Avoid unconditionalized use of PATH_MAX to fix build failure
- on hurd architecture.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: https://sourceforge.net/support/tracker.php?aid=3102139
----
- src/main.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- jackeq.orig/src/main.c
-+++ jackeq/src/main.c
-@@ -32,8 +32,9 @@ gboolean update_meters(gpointer data);
- 
- int main(int argc, char *argv[])
- {
--    char rcfile[PATH_MAX], title[128];
-+    char *rcfile, title[128];
-     int fd;
-+    size_t rcfile_size;
- 
- 
- #ifdef ENABLE_NLS
-@@ -50,7 +51,10 @@ int main(int argc, char *argv[])
- 
-     /* look for the rcfile, if its there parse it */
- 
--    snprintf(rcfile, PATH_MAX, "%s/%s", getenv("HOME"), ".jackeqrc");
-+    /* $HOME + 10 + 1 = $HOME + "/.jackeqrc" + '\0' */
-+    rcfile_size = strlen(getenv("HOME")) + 11;
-+    rcfile = malloc(rcfile_size);
-+    snprintf(rcfile, rcfile_size, "%s/%s", getenv("HOME"), ".jackeqrc");
-     if ((fd = open(rcfile, O_RDONLY)) >= 0) {	close(fd);
- 	printf("Using jackeqrc file: %s\n", rcfile);
- 	gtk_rc_parse(rcfile);
-@@ -76,6 +80,7 @@ int main(int argc, char *argv[])
-     process_init();
-     g_timeout_add(100, update_meters, NULL);
-     gtk_main();
-+    free(rcfile);
- 
-     return 0;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 8413412..92dc794 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-binutils_gold.patch
 02-l10n.patch
-03-pathmax.patch

-- 
jackeq packaging



More information about the pkg-multimedia-commits mailing list