Hello community,
here is the log from the commit of package ico for openSUSE:Factory checked in at 2013-01-22 15:38:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ico (Old)
and /work/SRC/openSUSE:Factory/.ico.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ico", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/ico/ico.changes 2012-05-08 11:57:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ico.new/ico.changes 2013-01-22 15:38:04.000000000 +0100
@@ -1,0 +2,15 @@
+Sat Jan 19 09:44:03 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 1.0.4:
+ + Fix some 64-bit vs. 32-bit conversion errors.
+ + Mark a couple parameters as unused to silence compiler warnings
+ + Add const qualifiers to fix gcc -Wwrite-strings warnings.
+ + Replace local checks for gcc with _X_NORETURN from
+ xproto 7.0.17.
+ + config:
+ - Move man pages into their own directory.
+ - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS.
+- Replace pkgconfig(xorg-macros) with pkgconfig(xproto)
+ BuildRequires, since this is what configure checks for now.
+
+-------------------------------------------------------------------
Old:
----
ico-1.0.3.tar.bz2
New:
----
ico-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ico.spec ++++++
--- /var/tmp/diff_new_pack.4lMi7A/_old 2013-01-22 15:38:05.000000000 +0100
+++ /var/tmp/diff_new_pack.4lMi7A/_new 2013-01-22 15:38:05.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ico
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,17 +15,18 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: ico
-Version: 1.0.3
+Version: 1.0.4
Release: 0
-License: MIT
Summary: Simple animation program used for testing X11 operations and extensions
-Url: http://xorg.freedesktop.org/
+License: MIT
Group: System/X11/Utilities
+Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
BuildRequires: pkg-config
BuildRequires: pkgconfig(x11) >= 0.99.1
-BuildRequires: pkgconfig(xorg-macros) >= 1.8
+BuildRequires: pkgconfig(xproto) >= 7.0.22
# This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ ico-1.0.3.tar.bz2 -> ico-1.0.4.tar.bz2 ++++++
++++ 10154 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ico-1.0.3/ChangeLog new/ico-1.0.4/ChangeLog
--- old/ico-1.0.3/ChangeLog 2010-10-30 22:12:13.000000000 +0200
+++ new/ico-1.0.4/ChangeLog 2013-01-16 03:20:36.000000000 +0100
@@ -1,3 +1,91 @@
+commit 0c5f08dee87e0453e3263f8aa5ca545a0a03353e
+Author: Alan Coopersmith
+Date: Tue Jan 15 18:19:49 2013 -0800
+
+ ico 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit d065113b4fadbb674e6e6f2a7681105f4f0212d3
+Author: Alan Coopersmith
+Date: Thu Jan 3 20:06:17 2013 -0800
+
+ Fix some 64-bit vs. 32-bit conversion errors
+
+ ico.c:851:7: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
+ fg = WhitePixel(dpy, DefaultScreen(dpy));
+ ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ ico.c:852:7: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
+ bg = BlackPixel(dpy, DefaultScreen(dpy));
+ ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ ico.c:858:18: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
+ bg = cdef.pixel;
+ ~ ~~~~~^~~~~
+
+ ico.c:866:18: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
+ fg = cdef.pixel;
+ ~ ~~~~~^~~~~
+
+ ico.c:874:11: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32]
+ bg = tmp;
+
+ Signed-off-by: Alan Coopersmith
+
+commit 99ca5c8deb4a3ebd4b2a7e64bd64ca9a91b6680c
+Author: Alan Coopersmith
+Date: Thu Jan 3 19:51:06 2013 -0800
+
+ Mark a couple parameters as unused to silence compiler warnings
+
+ ico.c:436:20: warning: unused parameter 'display' [-Wunused-parameter]
+ predicate(Display *display, XEvent *event, XPointer args)
+
+ ico.c:511:51: warning: unused parameter 'firsttime' [-Wunused-parameter]
+ setDisplayBuf(struct closure *closure, int n, int firsttime)
+
+ Signed-off-by: Alan Coopersmith
+
+commit 94c5e76c2d1043a835b0872f78902ebdfc3c5492
+Author: Alan Coopersmith
+Date: Tue Jun 5 17:50:45 2012 -0700
+
+ Add const qualifiers to fix gcc -Wwrite-strings warnings
+
+ Signed-off-by: Alan Coopersmith
+
+commit 83a7600ae9dbe8b2ca0f9199222245792fb8c0d6
+Author: Alan Coopersmith
+Date: Tue Jun 7 23:59:41 2011 -0700
+
+ Replace local checks for gcc with _X_NORETURN from xproto 7.0.17
+
+ Also declare icoFatal as static since it's only used in this one file.
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Mark Kettenis
+ Reviewed-by: Cyril Brulebois
+
+commit 7abead5688c1958822e3084a5c9854eb52ac58ec
+Author: Gaetan Nadon
+Date: Wed Jan 19 10:06:55 2011 -0500
+
+ config: move man pages into their own directory
+
+ Use services provided by XORG_MANPAGE_SECTIONS.
+ Use standard Makefile for man pages.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 9d266c12261d32d2e3ceb167b16f6867e9ccc5fa
+Author: Gaetan Nadon
+Date: Wed Jan 12 16:28:02 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ This silences an Autoconf warning
+
commit 849d04b09a12e51fb4e17269e2e3a61ce205a014
Author: Alan Coopersmith
Date: Sat Oct 30 13:11:36 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ico-1.0.3/Makefile.am new/ico-1.0.4/Makefile.am
--- old/ico-1.0.3/Makefile.am 2010-10-30 22:08:47.000000000 +0200
+++ new/ico-1.0.4/Makefile.am 2013-01-16 03:20:05.000000000 +0100
@@ -19,6 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = ico
AM_CFLAGS = $(ICO_CFLAGS) $(CWARNFLAGS)
@@ -34,18 +35,7 @@
objpyr.h \
polyinfo.h
-appman_PRE = \
- ico.man
-
-
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
.PHONY: ChangeLog INSTALL
@@ -56,9 +46,3 @@
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ico-1.0.3/configure.ac new/ico-1.0.4/configure.ac
--- old/ico-1.0.3/configure.ac 2010-10-30 22:11:23.000000000 +0200
+++ new/ico-1.0.4/configure.ac 2013-01-16 03:20:05.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT([ico], [1.0.3],
+AC_INIT([ico], [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [ico])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -33,13 +33,16 @@
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
# Checks for pkg-config packages
-PKG_CHECK_MODULES(ICO, x11 >= 0.99.1)
+PKG_CHECK_MODULES(ICO, [x11 >= 0.99.1 xproto >= 7.0.22])
XTHREADLIB=`$PKG_CONFIG --variable=xthreadlib x11`
AC_SUBST(XTHREADLIB)
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+ Makefile
+ man/Makefile])
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ico-1.0.3/ico.c new/ico-1.0.4/ico.c
--- old/ico-1.0.3/ico.c 2010-10-30 22:10:14.000000000 +0200
+++ new/ico-1.0.4/ico.c 2013-01-16 03:20:05.000000000 +0100
@@ -174,7 +174,7 @@
* any additional threads are created
*/
-static char *Primaries[] = {
+static const char *Primaries[] = {
"red", "green", "blue", "yellow", "cyan", "magenta"
};
#define NumberPrimaries 6
@@ -219,7 +219,7 @@
static const char *geom = NULL; /* -geometry: window geometry */
static int useRoot = 0; /* -r */
static int dash = 0; /* -d: dashed line pattern */
-static char **colornames; /* -colors (points into argv) */
+static const char **colornames; /* -colors (points into argv) */
#ifdef MULTIBUFFER
static int update_action = MultibufferUpdateActionBackground;
#endif
@@ -254,11 +254,10 @@
* Error handling
*****************************************************************************/
-#if defined(__GNUC__) && \
- ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
-void icoFatal (const char *fmt, const char *a0) __attribute__((__noreturn__));
-#endif
-void
+
+static void icoFatal (const char *fmt, const char *a0) _X_NORETURN;
+
+static void
icoFatal(const char *fmt, const char *a0)
{
fprintf(stderr, "%s: ", ProgramName);
@@ -434,7 +433,7 @@
*/
static Bool
-predicate(Display *display, XEvent *event, XPointer args)
+predicate(_X_UNUSED Display *display, XEvent *event, XPointer args)
{
Window w = (Window) args;
return event->xany.window == w;
@@ -509,7 +508,11 @@
}
static void
-setDisplayBuf(struct closure *closure, int n, int firsttime)
+setDisplayBuf(struct closure *closure, int n,
+#ifndef MULTIBUFFER
+ _X_UNUSED
+#endif
+ int firsttime)
{
#ifdef MULTIBUFFER
if (multibufext && dblbuf) {
@@ -717,7 +720,8 @@
}
static void
-initDBufs(struct closure *closure, int fg, int bg, int planesperbuf)
+initDBufs(struct closure *closure, unsigned long fg, unsigned long bg,
+ int planesperbuf)
{
int i,j,jj,j0,j1,k,m,t;
DBufInfo *b;
@@ -799,7 +803,7 @@
}
static void
-setBufColname(struct closure *closure, int n, char *colname)
+setBufColname(struct closure *closure, int n, const char *colname)
{
int t;
XColor dcolor, color;
@@ -816,7 +820,7 @@
static void *
do_ico_window(void *ptr)
{
- int fg, bg;
+ unsigned long fg, bg;
XSetWindowAttributes xswa;
XWindowAttributes xwa;
XEvent xev;
@@ -1148,7 +1152,7 @@
icoFatal("can't find object %s", name);
}
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
{
const char *display = NULL;
#ifdef MULTIBUFFER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ico-1.0.3/ico.man new/ico-1.0.4/ico.man
--- old/ico-1.0.3/ico.man 2010-10-30 22:10:14.000000000 +0200
+++ new/ico-1.0.4/ico.man 1970-01-01 01:00:00.000000000 +0100
@@ -1,90 +0,0 @@
-.TH ICO 1 __xorgversion__
-.SH NAME
-ico \- animate an icosahedron or other polyhedron
-.SH SYNOPSIS
-.B ico
-[-display display] [-geometry geometry]
-[-r] [-d pattern] [-i] [-dbl] [-faces] [-noedges]
-[-sleep n] [-obj object] [-objhelp] [-colors color-list]
-.SH DESCRIPTION
-.I Ico
-displays a wire-frame rotating polyhedron, with hidden lines removed,
-or a solid-fill polyhedron with hidden faces removed.
-There are a number of different polyhedra available;
-adding a new polyhedron to the program is quite simple.
-.SH OPTIONS
-.TP
-.B -r
-Display on the root window instead of creating a new window.
-.TP
-.B -d pattern
-Specify a bit pattern for drawing dashed lines for wire frames.
-.TP
-.B -i
-Use inverted colors for wire frames.
-.TP
-.B -dbl
-Use double buffering on the display.
-This works for either wire frame or solid fill drawings.
-For solid fill drawings, using this switch results in substantially
-smoother movement.
-Note that this requires twice as many bit planes as without double buffering.
-Since some colors are typically allocated by other programs,
-most eight-bit-plane displays will probably be limited to eight colors
-when using double buffering.
-.TP
-.B -faces
-Draw filled faces instead of wire frames.
-.TP
-.B -noedges
-Don't draw the wire frames.
-Typically used only when -faces is used.
-.TP
-.B -sleep \fIn\fP
-Sleep n seconds between each move of the object.
-.TP
-.B -obj \fIobject\fP
-Specify what object to draw.
-If no object is specified, an icosahedron is drawn.
-.TP
-.B -objhelp
-Print out a list of the available objects, along with information
-about each object.
-.TP
-.B -colors \fIcolor color ...\fP
-Specify what colors should be used to draw the filled faces of the object.
-If less colors than faces are given, the colors are reused.
-.SH PROGRAM TERMINATION
-.LP
-Pressing "q" will close a window. If compiled with threads support, the
-program will stop only when all threads terminate. You can also close an
-animation window using the ICCCM \fIdelete\fP message (depending on your
-window manager, you will have a decoration button or menu to send such
-message).
-.SH ADDING POLYHEDRA
-.LP
-If you have the source to ico, it is very easy to add more polyhedra.
-Each polyhedron is defined in an include file by the name of objXXX.h,
-where XXX is something related to the name of the polyhedron.
-The format of the include file is defined in the file polyinfo.h.
-Look at the file objcube.h to see what the exact format of an objXXX.h
-file should be, then create your objXXX.h file in that format.
-.LP
-After making the new objXXX.h file (or copying in a new one from elsewhere),
-simply do a 'make depend'.
-This will recreate the file allobjs.h, which lists all of the objXXX.h
-files.
-Doing a 'make' after this will rebuild ico with the new object information.
-.SH "SEE ALSO"
-X(__miscmansuffix__)
-.SH BUGS
-.LP
-Pyramids and tetrahedrons with filled faces do not display correctly.
-.LP
-A separate color cell is allocated for each name in the -colors list, even
-when the same name may be specified twice. Color allocation fails in
-TrueColor displays and option \fI-faces\fP does not work well.
-.SH COPYRIGHT
-Copyright 1994 X Consortium
-.br
-See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ico-1.0.3/man/Makefile.am new/ico-1.0.4/man/Makefile.am
--- old/ico-1.0.3/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/ico-1.0.4/man/Makefile.am 2013-01-16 03:20:05.000000000 +0100
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = ico.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ico-1.0.3/man/ico.man new/ico-1.0.4/man/ico.man
--- old/ico-1.0.3/man/ico.man 1970-01-01 01:00:00.000000000 +0100
+++ new/ico-1.0.4/man/ico.man 2013-01-16 03:20:05.000000000 +0100
@@ -0,0 +1,90 @@
+.TH ICO 1 __xorgversion__
+.SH NAME
+ico \- animate an icosahedron or other polyhedron
+.SH SYNOPSIS
+.B ico
+[-display display] [-geometry geometry]
+[-r] [-d pattern] [-i] [-dbl] [-faces] [-noedges]
+[-sleep n] [-obj object] [-objhelp] [-colors color-list]
+.SH DESCRIPTION
+.I Ico
+displays a wire-frame rotating polyhedron, with hidden lines removed,
+or a solid-fill polyhedron with hidden faces removed.
+There are a number of different polyhedra available;
+adding a new polyhedron to the program is quite simple.
+.SH OPTIONS
+.TP
+.B -r
+Display on the root window instead of creating a new window.
+.TP
+.B -d pattern
+Specify a bit pattern for drawing dashed lines for wire frames.
+.TP
+.B -i
+Use inverted colors for wire frames.
+.TP
+.B -dbl
+Use double buffering on the display.
+This works for either wire frame or solid fill drawings.
+For solid fill drawings, using this switch results in substantially
+smoother movement.
+Note that this requires twice as many bit planes as without double buffering.
+Since some colors are typically allocated by other programs,
+most eight-bit-plane displays will probably be limited to eight colors
+when using double buffering.
+.TP
+.B -faces
+Draw filled faces instead of wire frames.
+.TP
+.B -noedges
+Don't draw the wire frames.
+Typically used only when -faces is used.
+.TP
+.B -sleep \fIn\fP
+Sleep n seconds between each move of the object.
+.TP
+.B -obj \fIobject\fP
+Specify what object to draw.
+If no object is specified, an icosahedron is drawn.
+.TP
+.B -objhelp
+Print out a list of the available objects, along with information
+about each object.
+.TP
+.B -colors \fIcolor color ...\fP
+Specify what colors should be used to draw the filled faces of the object.
+If less colors than faces are given, the colors are reused.
+.SH PROGRAM TERMINATION
+.LP
+Pressing "q" will close a window. If compiled with threads support, the
+program will stop only when all threads terminate. You can also close an
+animation window using the ICCCM \fIdelete\fP message (depending on your
+window manager, you will have a decoration button or menu to send such
+message).
+.SH ADDING POLYHEDRA
+.LP
+If you have the source to ico, it is very easy to add more polyhedra.
+Each polyhedron is defined in an include file by the name of objXXX.h,
+where XXX is something related to the name of the polyhedron.
+The format of the include file is defined in the file polyinfo.h.
+Look at the file objcube.h to see what the exact format of an objXXX.h
+file should be, then create your objXXX.h file in that format.
+.LP
+After making the new objXXX.h file (or copying in a new one from elsewhere),
+simply do a 'make depend'.
+This will recreate the file allobjs.h, which lists all of the objXXX.h
+files.
+Doing a 'make' after this will rebuild ico with the new object information.
+.SH "SEE ALSO"
+X(__miscmansuffix__)
+.SH BUGS
+.LP
+Pyramids and tetrahedrons with filled faces do not display correctly.
+.LP
+A separate color cell is allocated for each name in the -colors list, even
+when the same name may be specified twice. Color allocation fails in
+TrueColor displays and option \fI-faces\fP does not work well.
+.SH COPYRIGHT
+Copyright 1994 X Consortium
+.br
+See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org