From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pdfel-0005PR-VT for garchives@archives.gentoo.org; Fri, 14 Jan 2011 09:09:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3271E07F0; Fri, 14 Jan 2011 09:09:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7E47DE0891 for ; Fri, 14 Jan 2011 09:09:08 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B75E81B43D0 for ; Fri, 14 Jan 2011 09:09:07 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2264) id 4C4D420047; Fri, 14 Jan 2011 09:09:06 +0000 (UTC) From: "Justin Lecher (jlec)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, jlec@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/fltk/files: fltk-1.3.0_rc3-conf-tests.patch fltk-1.3.0_rc3-as-needed.patch fltk-1.3.0_rc3-share.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: fltk-1.3.0_rc3-conf-tests.patch fltk-1.3.0_rc3-as-needed.patch fltk-1.3.0_rc3-share.patch X-VCS-Directories: x11-libs/fltk/files X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher Content-Type: text/plain; charset=utf8 Message-Id: <20110114090906.4C4D420047@flycatcher.gentoo.org> Date: Fri, 14 Jan 2011 09:09:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c96e0cee-f75f-43fe-b4d2-724c0678be31 X-Archives-Hash: 702f1723ef1cb7b2c8629456432a61cc jlec 11/01/14 09:09:06 Added: fltk-1.3.0_rc3-conf-tests.patch fltk-1.3.0_rc3-as-needed.patch fltk-1.3.0_rc3-share.patch Log: Version Bump, 262395; Thanks Grygoriy I. Fuchedzhy for prelimary ebuild =20 (Portage version: 2.2.0_alpha15/cvs/Linux x86_64) Revision Changes Path 1.1 x11-libs/fltk/files/fltk-1.3.0_rc3-conf-tests.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/fltk/file= s/fltk-1.3.0_rc3-conf-tests.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/fltk/file= s/fltk-1.3.0_rc3-conf-tests.patch?rev=3D1.1&content-type=3Dtext/plain Index: fltk-1.3.0_rc3-conf-tests.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/Makefile b/Makefile index ccec15c..747625e 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ =20 include makeinclude =20 -DIRS =3D $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation +DIRS =3D $(IMAGEDIRS) src $(CAIRODIR) fluid =20 all: makeinclude fltk-config for dir in $(DIRS); do\ @@ -35,6 +35,10 @@ all: makeinclude fltk-config (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ done =20 +check: all=09 + $(MAKE) $(MFLAGS) -C test || exit 1 + + install: makeinclude -mkdir -p $(DESTDIR)$(bindir) $(RM) $(DESTDIR)$(bindir)/fltk-config @@ -109,9 +113,6 @@ makeinclude: configure configh.in makeinclude.in touch config.h chmod +x fltk-config =20 -configure: configure.in - autoconf - portable-dist: epm -v -s fltk.xpm fltk =20 diff --git a/configure.in b/configure.in index 3ca79ef..bf0dc28 100644 --- a/configure.in +++ b/configure.in @@ -1114,7 +1114,7 @@ if test -n "$GCC"; then if test "x$with_optim" !=3D x; then OPTIM=3D"$with_optim $OPTIM" else - OPTIM=3D"-Os $OPTIM" + OPTIM=3D"$OPTIM" fi fi =20 diff --git a/documentation/Makefile b/documentation/Makefile index 1742cfa..8102c43 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -92,11 +92,6 @@ install: $(MANPAGES) $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ fi echo "Installing man pages in $(DESTDIR)$(mandir) ..." - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)= /cat1 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/f= ltk-config.1 @@ -104,10 +99,6 @@ install: $(MANPAGES) $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 =20 install-linux install-osx: - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/ca= t6 - $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks= .6 $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/chec= kers.6 @@ -116,17 +107,11 @@ install-linux install-osx: =20 uninstall: $(RMDIR) $(DESTDIR)$(docdir) - $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) $(RM) $(DESTDIR)$(mandir)/man1/fluid.1 - $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 - $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) $(RM) $(DESTDIR)$(mandir)/man3/fltk.3 =20 uninstall-linux uninstall-osx: - $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) $(RM) $(DESTDIR)$(mandir)/man6/blocks.6 $(RM) $(DESTDIR)$(mandir)/man6/checkers.6 $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 1.1 x11-libs/fltk/files/fltk-1.3.0_rc3-as-needed.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/fltk/file= s/fltk-1.3.0_rc3-as-needed.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/fltk/file= s/fltk-1.3.0_rc3-as-needed.patch?rev=3D1.1&content-type=3Dtext/plain Index: fltk-1.3.0_rc3-as-needed.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/configure.in b/configure.in index c965e56..3ca79ef 100644 --- a/configure.in +++ b/configure.in @@ -150,7 +150,7 @@ if test x$enable_cairoext =3D xyes; then dnl we do not rely on pkg-config . CAIRODIR=3D"cairo" CAIROFLAGS=3D"`pkg-config --cflags cairo`" - CAIROLIBS=3D"-lcairo -lpixman-1" + CAIROLIBS=3D"`pkg-config --libs cairo pixman-1`" CXXFLAGS=3D"$CAIROFLAGS $CXXFLAGS" LINKFLTKCAIRO=3D"../lib/libfltk_cairo.a" FLTKCAIROOPTION=3D"-L ../cairo -lfltk_cairo$SHAREDSUFFIX" @@ -164,7 +164,7 @@ else dnl we do not rely on pkg-config . CAIRODIR=3D"cairo" CAIROFLAGS=3D"`pkg-config --cflags cairo`" - CAIROLIBS=3D"-lcairo -lpixman-1" + CAIROLIBS=3D"`pkg-config --libs cairo pixman-1`" CXXFLAGS=3D"$CAIROFLAGS $CXXFLAGS" LINKFLTKCAIRO=3D"../lib/libfltk_cairo.a" FLTKCAIROOPTION=3D"-L ../cairo -lfltk_cairo$SHAREDSUFFIX" @@ -278,10 +278,7 @@ if test x$enable_shared =3D xyes; then GLDSONAME=3D"libfltk_gl.so.$FL_API_VERSION" IMGDSONAME=3D"libfltk_images.so.$FL_API_VERSION" CAIRODSONAME=3D"libfltk_cairo.so.$FL_API_VERSION" - DSOCOMMAND=3D"\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS= ) -shared -fPIC $DEBUGFLAG -o" - if test "x$libdir" !=3D "x/usr/lib" -a "x$libdir" !=3D "x/usr/lib64= "; then - DSOLINK=3D"-Wl,-rpath,$libdir" - fi + DSOCOMMAND=3D"\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\= $@ -shared -fPIC $DEBUGFLAG -o" ;; AIX*) DSONAME=3D"libfltk_s.a" diff --git a/src/Makefile b/src/Makefile index 7050173..de2b4a4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -240,13 +240,13 @@ $(LIBNAME): $(OBJECTS) =20 libfltk.so.1.3: $(OBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(OBJECTS) + $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) $(RM) libfltk.so $(LN) libfltk.so.1.3 libfltk.so =20 libfltk.sl.1.3: $(OBJECTS) echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(OBJECTS) + $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) $(RM) libfltk.sl $(LN) libfltk.sl.1.3 libfltk.sl =20 @@ -262,7 +262,7 @@ libfltk.1.3.dylib: $(OBJECTS) =20 libfltk_s.a: $(OBJECTS) echo $(DSOCOMMAND) libfltk_s.o ... - $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) + $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o $(RM) $@ $(LIBCOMMAND) libfltk_s.a libfltk_s.o @@ -276,13 +276,13 @@ $(FLLIBNAME): $(FLOBJECTS) =20 libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk + $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk $(RM) libfltk_forms.so $(LN) libfltk_forms.so.1.3 libfltk_forms.so =20 libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk + $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk $(RM) libfltk_forms.sl $(LN) libfltk_forms.sl.1.3 libfltk_forms.sl =20 @@ -298,7 +298,7 @@ libfltk_forms.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dyl= ib =20 libfltk_forms_s.a: $(FLOBJECTS) echo $(DSOCOMMAND) libfltk_forms_s.o ... - $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) + $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o $(RM) $@ $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o @@ -312,13 +312,13 @@ $(GLLIBNAME): $(GLOBJECTS) =20 libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk + $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(GLDLIBS) $(GLLIB) $(RM) libfltk_gl.so $(LN) libfltk_gl.so.1.3 libfltk_gl.so =20 libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk + $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(RM) libfltk_gl.sl $(LN) libfltk_gl.sl.1.3 libfltk_gl.sl =20 @@ -334,7 +334,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib =20 libfltk_gl_s.a: $(GLOBJECTS) echo $(DSOCOMMAND) libfltk_gl_s.o ... - $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) + $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) $(GLLIB) echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o $(RM) $@ $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o @@ -348,13 +348,13 @@ $(IMGLIBNAME): $(IMGOBJECTS) =20 libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk + $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk $(RM) libfltk_images.so $(LN) libfltk_images.so.1.3 libfltk_images.so =20 libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk + $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk $(RM) libfltk_images.sl $(LN) libfltk_images.sl.1.3 libfltk_images.sl =20 @@ -370,7 +370,7 @@ libfltk_images.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.d= ylib =20 libfltk_images_s.a: $(IMGOBJECTS) echo $(DSOCOMMAND) libfltk_images_s.o ... - $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) + $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o $(RM) $@ $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o diff --git a/cairo/Makefile b/cairo/Makefile index 24a8f32..894624a 100644 --- a/cairo/Makefile +++ b/cairo/Makefile @@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS) =20 libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk + $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) $(RM) libfltk_cairo.so $(LN) $(CAIRODSONAME) libfltk_cairo.so =20 libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3 echo $(DSOCOMMAND) $@ ... - $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk + $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) $(RM) libfltk_cairo.sl $(LN) libfltk_cairo.sl.1.3 libfltk_cairo.sl =20 1.1 x11-libs/fltk/files/fltk-1.3.0_rc3-share.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/fltk/file= s/fltk-1.3.0_rc3-share.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/fltk/file= s/fltk-1.3.0_rc3-share.patch?rev=3D1.1&content-type=3Dtext/plain Index: fltk-1.3.0_rc3-share.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/fluid/Makefile b/fluid/Makefile index 1cb3210..9d438a5 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -82,16 +82,16 @@ install: all $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) =20 install-linux: - -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications - $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applications + -$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications + $(INSTALL_DATA) fluid.desktop $(DESTDIR)$(datadir)/applications for size in 16 32 48 64 128; do \ - if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps= ; then \ - $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/a= pps; \ + if test ! -d $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps= ; then \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/a= pps; \ fi; \ - $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hico= lor/$${size}x$${size}/apps/fluid.png; \ + $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)$(datadir)/icons/hico= lor/$${size}x$${size}/apps/fluid.png; \ done - -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application - $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/applicati= on + -$(INSTALL_DIR) $(DESTDIR)$(datadir)/mimelnk/application + $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)$(datadir)/mimelnk/applicati= on =20 install-osx: echo Installing Fluid in $(DESTDIR)/Applications... @@ -109,9 +109,9 @@ uninstall: $(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT) =20 uninstall-linux: - $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop - $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png - $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop + $(RM) $(DESTDIR)$(datadir)/applications/fluid.desktop + $(RM) $(DESTDIR)$(datadir)/icons/hicolor/*/fluid.png + $(RM) $(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop =20 uninstall-osx: $(RM) -r $(DESTDIR)/Applications/fluid.app