From 49253cc262256553861f73ff7a04ef0bdf6adcc6 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Feb 10 2010 15:15:54 +0000 Subject: - Explicitly check for and link against libX11 (will be in upstream 1.9.19) - Remove obsolete "chmod -x" on dynarray.h - Update nted.desktop translations from upstream's nted.desktop --- diff --git a/.cvsignore b/.cvsignore index f168255..1727062 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -nted-1.9.17.tar.gz +nted-1.9.18.tar.gz diff --git a/nted-1.9.18-link-fix-for-fedora.patch b/nted-1.9.18-link-fix-for-fedora.patch new file mode 100644 index 0000000..af97540 --- /dev/null +++ b/nted-1.9.18-link-fix-for-fedora.patch @@ -0,0 +1,224 @@ +diff -ru nted-1.9.18/configure nted-1.9.18-link-fix/configure +--- nted-1.9.18/configure 2010-02-02 15:07:52.000000000 +0100 ++++ nted-1.9.18-link-fix/configure 2010-02-10 08:24:04.000000000 +0100 +@@ -615,6 +615,8 @@ + XMLTO + YELP + IMAGE2HEADER ++X11_LIBS ++X11_CFLAGS + FT2_LIBS + FT2_CFLAGS + GTK_LIBS +@@ -768,6 +770,8 @@ + GTK_LIBS + FT2_CFLAGS + FT2_LIBS ++X11_CFLAGS ++X11_LIBS + IMAGE2HEADER + YELP + XMLTO +@@ -1442,6 +1446,8 @@ + GTK_LIBS linker flags for GTK, overriding pkg-config + FT2_CFLAGS C compiler flags for FT2, overriding pkg-config + FT2_LIBS linker flags for FT2, overriding pkg-config ++ X11_CFLAGS C compiler flags for X11, overriding pkg-config ++ X11_LIBS linker flags for X11, overriding pkg-config + IMAGE2HEADER + gdk-pixbuf-csource program + YELP yelp program +@@ -6926,6 +6932,77 @@ + : + fi + ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for X11" >&5 ++$as_echo_n "checking for X11... " >&6; } ++ ++if test -n "$X11_CFLAGS"; then ++ pkg_cv_X11_CFLAGS="$X11_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "x11") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$X11_LIBS"; then ++ pkg_cv_X11_LIBS="$X11_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "x11") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1` ++ else ++ X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$X11_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ { { $as_echo "$as_me:$LINENO: error: Make xure the x11/X11/Xlib devel package is installed" >&5 ++$as_echo "$as_me: error: Make xure the x11/X11/Xlib devel package is installed" >&2;} ++ { (exit 1); exit 1; }; } ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:$LINENO: error: Make xure the x11/X11/Xlib devel package is installed" >&5 ++$as_echo "$as_me: error: Make xure the x11/X11/Xlib devel package is installed" >&2;} ++ { (exit 1); exit 1; }; } ++else ++ X11_CFLAGS=$pkg_cv_X11_CFLAGS ++ X11_LIBS=$pkg_cv_X11_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ : ++fi ++ + # Check for gdk-pixbuf-csource program + + # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. +diff -ru nted-1.9.18/configure.in nted-1.9.18-link-fix/configure.in +--- nted-1.9.18/configure.in 2010-02-02 15:07:30.000000000 +0100 ++++ nted-1.9.18-link-fix/configure.in 2010-02-10 08:22:50.000000000 +0100 +@@ -48,6 +48,7 @@ + PKG_CHECK_MODULES([CAIRO], [cairo], [], [AC_MSG_ERROR([Make sure the cairo devel package is installed])]) + PKG_CHECK_MODULES([GTK], [gtk+-2.0], [], [AC_MSG_ERROR([Make sure the gtk+-2.0 devel package is installed])]) + PKG_CHECK_MODULES([FT2], [freetype2], [], [AC_MSG_ERROR([Make sure the freetype(2) devel package is installed])]) ++PKG_CHECK_MODULES([X11], [x11], [], [AC_MSG_ERROR([Make xure the x11/X11/Xlib devel package is installed])]) + + # Check for gdk-pixbuf-csource program + AC_ARG_VAR([IMAGE2HEADER], [gdk-pixbuf-csource program]) +diff -ru nted-1.9.18/dialogs/Makefile.am nted-1.9.18-link-fix/dialogs/Makefile.am +--- nted-1.9.18/dialogs/Makefile.am 2010-01-12 15:56:26.000000000 +0100 ++++ nted-1.9.18-link-fix/dialogs/Makefile.am 2010-02-10 08:23:31.000000000 +0100 +@@ -19,7 +19,7 @@ + # # + ######################################################################################### + +-AM_CPPFLAGS = $(FT2_CFLAGS) -I$(top_srcdir) $(CAIRO_CFLAGS) $(GTK_CFLAGS) ++AM_CPPFLAGS = $(FT2_CFLAGS) -I$(top_srcdir) $(CAIRO_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) + + noinst_LIBRARIES = libdialogs.a + libdialogs_a_SOURCES = staffcontextdialog.cpp portchoosedialog.cpp paperconfigdialog.cpp \ +diff -ru nted-1.9.18/dialogs/Makefile.in nted-1.9.18-link-fix/dialogs/Makefile.in +--- nted-1.9.18/dialogs/Makefile.in 2010-02-02 15:07:53.000000000 +0100 ++++ nted-1.9.18-link-fix/dialogs/Makefile.in 2010-02-10 08:24:01.000000000 +0100 +@@ -179,6 +179,8 @@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ ++X11_CFLAGS = @X11_CFLAGS@ ++X11_LIBS = @X11_LIBS@ + XGETTEXT = @XGETTEXT@ + XGETTEXT_015 = @XGETTEXT_015@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +@@ -236,7 +238,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CPPFLAGS = $(FT2_CFLAGS) -I$(top_srcdir) $(CAIRO_CFLAGS) $(GTK_CFLAGS) ++AM_CPPFLAGS = $(FT2_CFLAGS) -I$(top_srcdir) $(CAIRO_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) + noinst_LIBRARIES = libdialogs.a + libdialogs_a_SOURCES = staffcontextdialog.cpp portchoosedialog.cpp \ + paperconfigdialog.cpp printconfigdialog.cpp tupletdialog.cpp \ +diff -ru nted-1.9.18/dialogs/tools.cpp nted-1.9.18-link-fix/dialogs/tools.cpp +--- nted-1.9.18/dialogs/tools.cpp 2010-01-12 15:56:26.000000000 +0100 ++++ nted-1.9.18-link-fix/dialogs/tools.cpp 2010-02-10 08:28:34.000000000 +0100 +@@ -20,6 +20,7 @@ + /****************************************************************************************/ + + #include ++#include + #include + #include "tools.h" + #include "localization.h" +diff -ru nted-1.9.18/Makefile.am nted-1.9.18-link-fix/Makefile.am +--- nted-1.9.18/Makefile.am 2010-01-12 15:56:30.000000000 +0100 ++++ nted-1.9.18-link-fix/Makefile.am 2010-02-10 08:23:47.000000000 +0100 +@@ -51,7 +51,7 @@ + temposign.h tuplet.h voice.h volumesign.h positionarray.h dynarray.h COPYING.GFDL COPYING.FONT.TXT \ + freechord.h freespacer.h pangocairotext.h freechordname.h midiimporter.h midirecorder.h + +-nted_LDADD = commands/libcommands.a dialogs/libdialogs.a chords/libchords.a idiotseditor/libidiotseditor.a $(CAIRO_LIBS) $(PANGO_LIBS) $(GTK_LIBS) -lasound ++nted_LDADD = commands/libcommands.a dialogs/libdialogs.a chords/libchords.a idiotseditor/libidiotseditor.a $(CAIRO_LIBS) $(PANGO_LIBS) $(GTK_LIBS) $(X11_LIBS) -lasound + + + cleanup: maintainer-clean cleanup-local +diff -ru nted-1.9.18/Makefile.in nted-1.9.18-link-fix/Makefile.in +--- nted-1.9.18/Makefile.in 2010-02-02 15:07:54.000000000 +0100 ++++ nted-1.9.18-link-fix/Makefile.in 2010-02-10 08:24:03.000000000 +0100 +@@ -259,6 +259,8 @@ + STRIP = @STRIP@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ ++X11_CFLAGS = @X11_CFLAGS@ ++X11_LIBS = @X11_LIBS@ + XGETTEXT = @XGETTEXT@ + XGETTEXT_015 = @XGETTEXT_015@ + XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +@@ -342,7 +344,7 @@ + dynarray.h COPYING.GFDL COPYING.FONT.TXT freechord.h \ + freespacer.h pangocairotext.h freechordname.h midiimporter.h \ + midirecorder.h +-nted_LDADD = commands/libcommands.a dialogs/libdialogs.a chords/libchords.a idiotseditor/libidiotseditor.a $(CAIRO_LIBS) $(PANGO_LIBS) $(GTK_LIBS) -lasound ++nted_LDADD = commands/libcommands.a dialogs/libdialogs.a chords/libchords.a idiotseditor/libidiotseditor.a $(CAIRO_LIBS) $(PANGO_LIBS) $(GTK_LIBS) $(X11_LIBS) -lasound + ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = config.rpath INSTALL README + all: config.h +@@ -525,7 +527,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -550,7 +552,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -714,7 +716,8 @@ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ diff --git a/nted.desktop b/nted.desktop index c5e2137..129d0a2 100644 --- a/nted.desktop +++ b/nted.desktop @@ -3,10 +3,14 @@ Encoding=UTF-8 Name=NtEd GenericName=Score editor GenericName[de]=Partitureditor +GenericName[en]=Score Editor +GenericName[es]=Editor de partituras GenericName[fr]=Éditeur de partition GenericName[it]=Redattore di spartiti Comment=Edit musical scores Comment[de]=Bearbeitet (musikal.) Partituren +Comment[en]=Edit musical scores +Comment[es]=Editor musical de partituras Comment[fr]=Ėdite des partitions musicales Comment[it]=Redige spartiti musicali Exec=nted @@ -14,5 +18,5 @@ Icon=nted StartupNotify=true Terminal=false Type=Application -Categories=Audio;AudioVideo;Midi;Music;Publishing +Categories=Audio;AudioVideo;Midi;Music;Publishing;X-Notation; diff --git a/nted.spec b/nted.spec index 38c1e81..e8f258a 100644 --- a/nted.spec +++ b/nted.spec @@ -14,8 +14,8 @@ Name: nted -Version: 1.9.17 -Release: 1%{?dist} +Version: 1.9.18 +Release: 2%{?dist} Summary: Musical score editor Group: Applications/Publishing @@ -26,6 +26,10 @@ URL: http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml Source0: http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/sources/nted-%{version}.tar.gz Source1: nted.desktop #Source2: %{name}-%{family}-fontconfig.conf + +# Explicitly check for and link against libX11 (will be in upstream 1.9.19) +Patch1: %{name}-%{version}-link-fix-for-fedora.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: gtk2-devel alsa-lib-devel @@ -69,9 +73,12 @@ NtEd's own special note symbol font. %prep %setup -q -# Upstream mistakenly ships a header file with its x bit set. -test -x dynarray.h # make sure we notice when upstream fixes that -chmod -x dynarray.h + +# Apply explicit X11 linkage patch, and avoid re-running autoreconf parts +%patch1 -p1 -b .link-X11 +sleep 1 +touch aclocal.m4 config.h.in +touch configure Makefile.in dialogs/Makefile.in %build @@ -124,6 +131,14 @@ rm -rf %{buildroot} %changelog +* Wed Feb 10 2010 Hans Ulrich Niedermann - 1.9.18-2 +- Explicitly check for and link against libX11 (will be in upstream 1.9.19) +- Remove obsolete "chmod -x" on dynarray.h +- Update nted.desktop translations from upstream's nted.desktop + +* Wed Feb 10 2010 Hans Ulrich Niedermann - 1.9.18-1 +- Update to 1.9.18 + * Thu Jan 21 2010 Hans Ulrich Niedermann - 1.9.17-1 - Update to 1.9.17 diff --git a/sources b/sources index 4ee3878..bc30f39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ae75f7b25cb871c4766e0b7abccb223 nted-1.9.17.tar.gz +5a6efc93ec718208ad18a5740c31a344 nted-1.9.18.tar.gz