Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (4dc0af91efd02d8ae3b9b97e9c11003667b27d4c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (4dc0af91efd02d8ae3b9b97e9c11003667b27d4c)
  • Date: Tue, 24 Apr 2012 20:15:09 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

x11/xosview/BUILD | 1
x11/xosview/DETAILS | 9 +--
x11/xosview/HISTORY | 5 ++
x11/xosview/INSTALL | 6 --
x11/xosview/PRE_BUILD | 3 -
x11/xosview/glibc-2.6.patch | 101
--------------------------------------------
6 files changed, 11 insertions(+), 114 deletions(-)

New commits:
commit 4dc0af91efd02d8ae3b9b97e9c11003667b27d4c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

xosview 1.9.3

diff --git a/x11/xosview/BUILD b/x11/xosview/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/x11/xosview/BUILD
@@ -0,0 +1 @@
+make
diff --git a/x11/xosview/DETAILS b/x11/xosview/DETAILS
index 4448f99..6aa0135 100755
--- a/x11/xosview/DETAILS
+++ b/x11/xosview/DETAILS
@@ -1,11 +1,10 @@
SPELL=xosview
- VERSION=1.8.3
+ VERSION=1.9.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:196dc66f4a20c6cd9663f82e613f0039ee09cfe565867dc68e3c29b8dc6be4037ad26f10a8a7f36e9b80fb5ab406592a30254840b473861be836e44503fd94a5
- WEB_SITE=http://xosview.sourceforge.net
- ENTERED=20020308
+ SOURCE_URL[0]=http://www.pogo.org.uk/~mark/xosview/releases/$SOURCE
+
SOURCE_HASH=sha512:909b25309a0eb055ee3341aa022934a795b7c9321c6a98328f2fd96cb82d41c065a2549746754c3aa2fe47a4672580aafef5fb0fac2c8e145b193046ccb8cd59
+ WEB_SITE=http://www.pogo.org.uk/~mark/xosview/
UPDATED=20031210
LICENSE=GPL
KEYWORDS="x11"
diff --git a/x11/xosview/HISTORY b/x11/xosview/HISTORY
index 6ed1957..0dfa3ae 100644
--- a/x11/xosview/HISTORY
+++ b/x11/xosview/HISTORY
@@ -1,3 +1,8 @@
+2012-04-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.9.3, WEB_SITE and SOURCE_URL[0] updated
+ * PRE_BUILD, glibc-2.6.patch: removed
+ * BUILD, INSTALL: updated to new build system
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-SERVER to the one and only xorg-server

diff --git a/x11/xosview/INSTALL b/x11/xosview/INSTALL
index 09ce2ab..765c72b 100755
--- a/x11/xosview/INSTALL
+++ b/x11/xosview/INSTALL
@@ -1,5 +1 @@
-mkdir -p "$INSTALL_ROOT"/etc/X11/app-defaults &&
-mkdir -p "$INSTALL_ROOT"/usr/lib/X11/app-defaults &&
-default_install &&
-mv "$INSTALL_ROOT"/usr/lib/X11/app-defaults/XOsview
"$INSTALL_ROOT"/etc/X11/app-defaults &&
-rmdir --ignore-fail-on-non-empty "$INSTALL_ROOT"/usr/lib/X11/app-defaults
+make install PREFIX=${INSTALL_ROOT}/usr
diff --git a/x11/xosview/PRE_BUILD b/x11/xosview/PRE_BUILD
deleted file mode 100755
index 7fa05e2..0000000
--- a/x11/xosview/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/glibc-2.6.patch
diff --git a/x11/xosview/glibc-2.6.patch b/x11/xosview/glibc-2.6.patch
deleted file mode 100644
index 8f705ba..0000000
--- a/x11/xosview/glibc-2.6.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -Naur xosview-1.8.3.orig/Xrm.cc xosview-1.8.3/Xrm.cc
---- xosview-1.8.3.orig/Xrm.cc 2007-12-01 10:37:19.247343664 -0800
-+++ xosview-1.8.3/Xrm.cc 2007-12-01 10:43:33.736684594 -0800
-@@ -17,7 +17,6 @@
- #include <iostream.h>
- #endif
- #include <unistd.h> // for access(), etc. BCG
--#include "snprintf.h"
- #include "general.h"
- #ifndef NULL
- #define NULL 0
-diff -Naur xosview-1.8.3.orig/bitfieldmeter.cc xosview-1.8.3/bitfieldmeter.cc
---- xosview-1.8.3.orig/bitfieldmeter.cc 2007-12-01 10:37:19.247343664
-0800
-+++ xosview-1.8.3/bitfieldmeter.cc 2007-12-01 10:43:36.752856477 -0800
-@@ -11,7 +11,6 @@
- #include <fstream.h>
- #endif
- #include <stdlib.h>
--#include "snprintf.h"
- #include "general.h"
- #include "bitfieldmeter.h"
- #include "xosview.h"
-diff -Naur xosview-1.8.3.orig/config/Makefile.top.in
xosview-1.8.3/config/Makefile.top.in
---- xosview-1.8.3.orig/config/Makefile.top.in 2007-12-01 10:37:19.247343664
-0800
-+++ xosview-1.8.3/config/Makefile.top.in 2007-12-01 10:46:37.839175999
-0800
-@@ -19,7 +19,6 @@
- bitfieldmeter.o \
- bitmeter.o \
- xosview.o \
--snprintf.o \
- main.o
-
- CFILES := $(OBJS:.o=.cc)
-diff -Naur xosview-1.8.3.orig/fieldmeter.cc xosview-1.8.3/fieldmeter.cc
---- xosview-1.8.3.orig/fieldmeter.cc 2007-12-01 10:37:19.243343436 -0800
-+++ xosview-1.8.3/fieldmeter.cc 2007-12-01 10:43:39.521014224 -0800
-@@ -17,7 +17,6 @@
- #include <fstream.h>
- #endif
- #include <stdlib.h>
--#include "snprintf.h"
- #include "general.h"
- #include "fieldmeter.h"
- #include "xosview.h"
-diff -Naur xosview-1.8.3.orig/snprintf.cc xosview-1.8.3/snprintf.cc
---- xosview-1.8.3.orig/snprintf.cc 2007-12-01 10:37:19.243343436 -0800
-+++ xosview-1.8.3/snprintf.cc 1969-12-31 16:00:00.000000000 -0800
-@@ -1,17 +0,0 @@
--#ifndef HAVE_SNPRINTF
--
--#include <stdarg.h>
--#include <stdio.h>
--
--extern "C" int snprintf ( char *str, int n, const char *format, ...)
-- {
-- /* punt the warning */
-- n++;
-- va_list ap;
-- va_start(ap, format);
-- int rval = vsprintf(str, format, ap);
-- va_end(ap);
-- return rval;
-- }
--
--#endif
-diff -Naur xosview-1.8.3.orig/snprintf.h xosview-1.8.3/snprintf.h
---- xosview-1.8.3.orig/snprintf.h 2007-12-01 10:37:19.243343436 -0800
-+++ xosview-1.8.3/snprintf.h 1969-12-31 16:00:00.000000000 -0800
-@@ -1,10 +0,0 @@
--#ifndef snprintf_h
--#define snprintf_h
--
--#ifndef HAVE_SNPRINTF
--extern "C" int snprintf ( char *str, int n, const char *format, ...);
--#else
--#include <stdio.h>
--#endif
--
--#endif
-diff -Naur xosview-1.8.3.orig/xosview.cc xosview-1.8.3/xosview.cc
---- xosview-1.8.3.orig/xosview.cc 2007-12-01 10:37:19.239343207 -0800
-+++ xosview-1.8.3/xosview.cc 2007-12-01 10:43:42.205167189 -0800
-@@ -9,7 +9,6 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/time.h>
--#include "snprintf.h"
- #include "general.h"
- #include "xosview.h"
- #include "meter.h"
-diff -Naur xosview-1.8.3.orig/xwin.cc xosview-1.8.3/xwin.cc
---- xosview-1.8.3.orig/xwin.cc 2007-12-01 10:37:19.239343207 -0800
-+++ xosview-1.8.3/xwin.cc 2007-12-01 10:43:44.781313993 -0800
-@@ -5,7 +5,6 @@
- #include <X11/Xatom.h>
- #include <stdlib.h>
- #include <unistd.h>
--#include "snprintf.h"
- #include "general.h"
- #include "xwin.h"
- #include "Xrm.h"



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (4dc0af91efd02d8ae3b9b97e9c11003667b27d4c), Ladislav Hagara, 04/24/2012

Archive powered by MHonArc 2.6.24.

Top of Page