Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (adc44520ba346f807f826d7e836845d29aea2039)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (adc44520ba346f807f826d7e836845d29aea2039)
  • Date: Sun, 17 Feb 2013 13:58:23 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

doc/openjade/HISTORY | 3 ++
doc/openjade/PRE_BUILD | 4 ++-
doc/openjade/openjade-1.3.2-msggen.pl.patch | 32
++++++++++++++++++++++++++++
libs/lightmediascanner/HISTORY | 3 ++
libs/lightmediascanner/PRE_BUILD | 1
libs/lightmediascanner/configure.patch | 19 ++++++++++++++++
6 files changed, 61 insertions(+), 1 deletion(-)

New commits:
commit adc44520ba346f807f826d7e836845d29aea2039
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

lightmediascanner: apply patch for autotool changes on scm version

commit 750eb6574e693dcc08a12d9b0c005f44e41af617
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

openjade: apply patch to build with perl 5.16 or later

diff --git a/doc/openjade/HISTORY b/doc/openjade/HISTORY
index 2152095..c41dc72 100644
--- a/doc/openjade/HISTORY
+++ b/doc/openjade/HISTORY
@@ -1,3 +1,6 @@
+2013-02-17 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: apply patch to build with perl 5.16 or later
+
2011-08-17 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: apply patch to remove -Werror

diff --git a/doc/openjade/PRE_BUILD b/doc/openjade/PRE_BUILD
index dfddac3..645e391 100755
--- a/doc/openjade/PRE_BUILD
+++ b/doc/openjade/PRE_BUILD
@@ -4,4 +4,6 @@ patch $SOURCE_DIRECTORY/style/MultiLineInlineNote.cxx \

cd $SOURCE_DIRECTORY &&

-patch -p1 < $SCRIPT_DIRECTORY/openjade-1.3.2-gcc-4.6-1.patch
+patch -p1 < $SCRIPT_DIRECTORY/openjade-1.3.2-gcc-4.6-1.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/openjade-1.3.2-msggen.pl.patch
+
diff --git a/doc/openjade/openjade-1.3.2-msggen.pl.patch
b/doc/openjade/openjade-1.3.2-msggen.pl.patch
new file mode 100644
index 0000000..1afe68b
--- /dev/null
+++ b/doc/openjade/openjade-1.3.2-msggen.pl.patch
@@ -0,0 +1,32 @@
+Use Getopt::Std in place of getopts.pl.
+https://bugs.gentoo.org/show_bug.cgi?id=420083
+
+--- a/msggen.pl
++++ b/msggen.pl
+@@ -4,6 +4,7 @@
+ # See the file COPYING for copying permission.
+
+ use POSIX;
++use Getopt::Std;
+
+ # Package and version.
+ $package = 'openjade';
+@@ -18,8 +19,7 @@
+ undef $opt_l;
+ undef $opt_p;
+ undef $opt_t;
+-do 'getopts.pl';
+-&Getopts('l:p:t:');
++getopts('l:p:t:');
+ $module = $opt_l;
+ $pot_file = $opt_p;
+
+@@ -72,7 +72,7 @@
+ else {
+ $field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");;
+ $type[$num] = substr($field[0], 0, 1);
+- $argc = int(substr($field[0], 1, 1));
++ $argc = substr($field[0], 1, 1);
+ }
+ $nargs[$num] = $argc;
+ $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag");
diff --git a/libs/lightmediascanner/HISTORY b/libs/lightmediascanner/HISTORY
index 700570c..58ce588 100644
--- a/libs/lightmediascanner/HISTORY
+++ b/libs/lightmediascanner/HISTORY
@@ -1,3 +1,6 @@
+2013-02-17 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: apply patch for autotool changes
+
2011-12-26 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated git url
* DEPENDS: added two optional depends if scm
diff --git a/libs/lightmediascanner/PRE_BUILD
b/libs/lightmediascanner/PRE_BUILD
index 26c21fc..cf6a0fd 100755
--- a/libs/lightmediascanner/PRE_BUILD
+++ b/libs/lightmediascanner/PRE_BUILD
@@ -3,5 +3,6 @@ default_pre_build &&
if [[ "$LIGHTMEDIASCANNER_SCM" == "y" ]]
then
cd $SOURCE_DIRECTORY &&
+ patch -p1 < $SPELL_DIRECTORY/configure.patch &&
NOCONFIGURE="on" ./autogen.sh
fi
diff --git a/libs/lightmediascanner/configure.patch
b/libs/lightmediascanner/configure.patch
new file mode 100644
index 0000000..307d7cb
--- /dev/null
+++ b/libs/lightmediascanner/configure.patch
@@ -0,0 +1,19 @@
+diff -ur lightmediascanner-git/configure.ac
lightmediascanner-mod/configure.ac
+--- lightmediascanner-git/configure.ac 2013-02-10 00:44:29.000000000 -0600
++++ lightmediascanner-mod/configure.ac 2013-02-17 13:53:37.049363760 -0600
+@@ -6,13 +6,13 @@
+ AC_ISC_POSIX
+
+ AM_INIT_AUTOMAKE(1.6 dist-bzip2)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ _XTERM_COLORS
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+ AC_PROG_CC
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_HEADER_STDC
+ AC_C_CONST



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (adc44520ba346f807f826d7e836845d29aea2039), Robin Cook, 02/17/2013

Archive powered by MHonArc 2.6.24.

Top of Page