| 1 |
bicatali 09/01/09 23:31:31 |
| 2 |
|
| 3 |
Added: fltk-1.1.9-conf-tests.patch |
| 4 |
fltk-1.1.9-as-needed.patch fltk-1.1.9-desktop.patch |
| 5 |
Log: |
| 6 |
Version bump for 1.1, with ebuild modernization and added games. Dropping ppc64 and hppa until htmldoc is keyworded. |
| 7 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/fltk/files/fltk-1.1.9-conf-tests.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-conf-tests.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-conf-tests.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: fltk-1.1.9-conf-tests.patch |
| 16 |
=================================================================== |
| 17 |
diff -Nur fltk-1.1.9.orig/configure.in fltk-1.1.9/configure.in |
| 18 |
--- fltk-1.1.9.orig/configure.in 2009-01-08 17:53:52.000000000 +0000 |
| 19 |
+++ fltk-1.1.9/configure.in 2009-01-09 17:23:38.000000000 +0000 |
| 20 |
@@ -919,7 +916,7 @@ |
| 21 |
if test "x$with_optim" != x; then |
| 22 |
OPTIM="$with_optim $OPTIM" |
| 23 |
else |
| 24 |
- OPTIM="-Os $OPTIM" |
| 25 |
+ OPTIM="$OPTIM" |
| 26 |
fi |
| 27 |
fi |
| 28 |
|
| 29 |
diff -Nur fltk-1.1.9.orig/documentation/Makefile fltk-1.1.9/documentation/Makefile |
| 30 |
--- fltk-1.1.9.orig/documentation/Makefile 2009-01-08 17:53:51.000000000 +0000 |
| 31 |
+++ fltk-1.1.9/documentation/Makefile 2009-01-09 17:22:19.000000000 +0000 |
| 32 |
@@ -237,11 +237,6 @@ |
| 33 |
$(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \ |
| 34 |
done |
| 35 |
echo "Installing man pages in $(DESTDIR)$(mandir)..." |
| 36 |
- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 |
| 37 |
- $(INSTALL_MAN) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 |
| 38 |
- $(INSTALL_MAN) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 |
| 39 |
- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 |
| 40 |
- $(INSTALL_MAN) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 |
| 41 |
-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 |
| 42 |
$(INSTALL_MAN) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 |
| 43 |
$(INSTALL_MAN) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 |
| 44 |
@@ -249,10 +244,6 @@ |
| 45 |
$(INSTALL_MAN) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 |
| 46 |
|
| 47 |
install-linux install-osx: |
| 48 |
- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 |
| 49 |
- $(INSTALL_MAN) blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 |
| 50 |
- $(INSTALL_MAN) checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 |
| 51 |
- $(INSTALL_MAN) sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 |
| 52 |
-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 |
| 53 |
$(INSTALL_MAN) blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 |
| 54 |
$(INSTALL_MAN) checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 |
| 55 |
@@ -261,17 +252,11 @@ |
| 56 |
|
| 57 |
uninstall: |
| 58 |
$(RMDIR) $(DESTDIR)$(docdir) |
| 59 |
- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) |
| 60 |
$(RM) $(DESTDIR)$(mandir)/man1/fluid.1 |
| 61 |
- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) |
| 62 |
$(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 |
| 63 |
- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) |
| 64 |
$(RM) $(DESTDIR)$(mandir)/man3/fltk.3 |
| 65 |
|
| 66 |
uninstall-linux uninstall-osx: |
| 67 |
- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) |
| 68 |
- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) |
| 69 |
- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) |
| 70 |
$(RM) $(DESTDIR)$(mandir)/man6/blocks.6 |
| 71 |
$(RM) $(DESTDIR)$(mandir)/man6/checkers.6 |
| 72 |
$(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 |
| 73 |
diff -Nur fltk-1.1.9.orig/Makefile fltk-1.1.9/Makefile |
| 74 |
--- fltk-1.1.9.orig/Makefile 2009-01-08 17:53:52.000000000 +0000 |
| 75 |
+++ fltk-1.1.9/Makefile 2009-01-09 17:20:49.000000000 +0000 |
| 76 |
@@ -27,7 +27,7 @@ |
| 77 |
|
| 78 |
include makeinclude |
| 79 |
|
| 80 |
-DIRS = $(IMAGEDIRS) src fluid test documentation |
| 81 |
+DIRS = $(IMAGEDIRS) src fluid |
| 82 |
|
| 83 |
all: makeinclude fltk-config |
| 84 |
for dir in $(DIRS); do\ |
| 85 |
@@ -35,6 +35,10 @@ |
| 86 |
(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ |
| 87 |
done |
| 88 |
|
| 89 |
+check: all |
| 90 |
+ $(MAKE) $(MFLAGS) -C test || exit 1 |
| 91 |
+ |
| 92 |
+ |
| 93 |
install: makeinclude |
| 94 |
-mkdir -p $(DESTDIR)$(bindir) |
| 95 |
$(RM) $(DESTDIR)$(bindir)/fltk-config |
| 96 |
@@ -110,9 +114,6 @@ |
| 97 |
touch config.h |
| 98 |
chmod +x fltk-config |
| 99 |
|
| 100 |
-configure: configure.in |
| 101 |
- autoconf |
| 102 |
- |
| 103 |
portable-dist: |
| 104 |
epm -v -s fltk.xpm fltk |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
1.1 x11-libs/fltk/files/fltk-1.1.9-as-needed.patch |
| 110 |
|
| 111 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-as-needed.patch?rev=1.1&view=markup |
| 112 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-as-needed.patch?rev=1.1&content-type=text/plain |
| 113 |
|
| 114 |
Index: fltk-1.1.9-as-needed.patch |
| 115 |
=================================================================== |
| 116 |
diff -Nur fltk-1.1.9.orig/configure.in fltk-1.1.9/configure.in |
| 117 |
--- fltk-1.1.9.orig/configure.in 2009-01-08 17:53:52.000000000 +0000 |
| 118 |
+++ fltk-1.1.9/configure.in 2009-01-09 14:11:39.000000000 +0000 |
| 119 |
@@ -179,10 +179,7 @@ |
| 120 |
FLDSONAME="libfltk_forms.so.$FL_API_VERSION" |
| 121 |
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" |
| 122 |
IMGDSONAME="libfltk_images.so.$FL_API_VERSION" |
| 123 |
- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" |
| 124 |
- if test "x$libdir" != "x/usr/lib"; then |
| 125 |
- DSOLINK="-Wl,-rpath,$libdir" |
| 126 |
- fi |
| 127 |
+ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" |
| 128 |
;; |
| 129 |
AIX*) |
| 130 |
DSONAME="libfltk_s.a" |
| 131 |
diff -Nur fltk-1.1.9.orig/src/Makefile fltk-1.1.9/src/Makefile |
| 132 |
--- fltk-1.1.9.orig/src/Makefile 2009-01-08 17:53:51.000000000 +0000 |
| 133 |
+++ fltk-1.1.9/src/Makefile 2009-01-09 14:08:53.000000000 +0000 |
| 134 |
@@ -210,13 +210,13 @@ |
| 135 |
|
| 136 |
libfltk.so.1.1: $(OBJECTS) |
| 137 |
echo $(DSOCOMMAND) $@ ... |
| 138 |
- $(DSOCOMMAND) $@ $(OBJECTS) |
| 139 |
+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) |
| 140 |
$(RM) libfltk.so |
| 141 |
$(LN) libfltk.so.1.1 libfltk.so |
| 142 |
|
| 143 |
libfltk.sl.1.1: $(OBJECTS) |
| 144 |
echo $(DSOCOMMAND) $@ ... |
| 145 |
- $(DSOCOMMAND) $@ $(OBJECTS) |
| 146 |
+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) |
| 147 |
$(RM) libfltk.sl |
| 148 |
$(LN) libfltk.sl.1.1 libfltk.sl |
| 149 |
|
| 150 |
@@ -232,7 +232,7 @@ |
| 151 |
|
| 152 |
libfltk_s.a: $(OBJECTS) |
| 153 |
echo $(DSOCOMMAND) libfltk_s.o ... |
| 154 |
- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) |
| 155 |
+ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) |
| 156 |
echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o |
| 157 |
$(RM) $@ |
| 158 |
$(LIBCOMMAND) libfltk_s.a libfltk_s.o |
| 159 |
@@ -246,13 +246,13 @@ |
| 160 |
|
| 161 |
libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1 |
| 162 |
echo $(DSOCOMMAND) $@ ... |
| 163 |
- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk |
| 164 |
+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk |
| 165 |
$(RM) libfltk_forms.so |
| 166 |
$(LN) libfltk_forms.so.1.1 libfltk_forms.so |
| 167 |
|
| 168 |
libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1 |
| 169 |
echo $(DSOCOMMAND) $@ ... |
| 170 |
- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk |
| 171 |
+ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk |
| 172 |
$(RM) libfltk_forms.sl |
| 173 |
$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl |
| 174 |
|
| 175 |
@@ -268,7 +268,7 @@ |
| 176 |
|
| 177 |
libfltk_forms_s.a: $(FLOBJECTS) |
| 178 |
echo $(DSOCOMMAND) libfltk_forms_s.o ... |
| 179 |
- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) |
| 180 |
+ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) |
| 181 |
echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o |
| 182 |
$(RM) $@ |
| 183 |
$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o |
| 184 |
@@ -282,13 +282,13 @@ |
| 185 |
|
| 186 |
libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1 |
| 187 |
echo $(DSOCOMMAND) $@ ... |
| 188 |
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk |
| 189 |
+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk |
| 190 |
$(RM) libfltk_gl.so |
| 191 |
$(LN) libfltk_gl.so.1.1 libfltk_gl.so |
| 192 |
|
| 193 |
libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1 |
| 194 |
echo $(DSOCOMMAND) $@ ... |
| 195 |
- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk |
| 196 |
+ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk |
| 197 |
$(RM) libfltk_gl.sl |
| 198 |
$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl |
| 199 |
|
| 200 |
@@ -304,7 +304,7 @@ |
| 201 |
|
| 202 |
libfltk_gl_s.a: $(GLOBJECTS) |
| 203 |
echo $(DSOCOMMAND) libfltk_gl_s.o ... |
| 204 |
- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) |
| 205 |
+ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) |
| 206 |
echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o |
| 207 |
$(RM) $@ |
| 208 |
$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o |
| 209 |
@@ -318,13 +318,13 @@ |
| 210 |
|
| 211 |
libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1 |
| 212 |
echo $(DSOCOMMAND) $@ ... |
| 213 |
- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk |
| 214 |
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk |
| 215 |
$(RM) libfltk_images.so |
| 216 |
$(LN) libfltk_images.so.1.1 libfltk_images.so |
| 217 |
|
| 218 |
libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1 |
| 219 |
echo $(DSOCOMMAND) $@ ... |
| 220 |
- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk |
| 221 |
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk |
| 222 |
$(RM) libfltk_images.sl |
| 223 |
$(LN) libfltk_images.sl.1.1 libfltk_images.sl |
| 224 |
|
| 225 |
@@ -340,7 +340,7 @@ |
| 226 |
|
| 227 |
libfltk_images_s.a: $(IMGOBJECTS) |
| 228 |
echo $(DSOCOMMAND) libfltk_images_s.o ... |
| 229 |
- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) |
| 230 |
+ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) |
| 231 |
echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o |
| 232 |
$(RM) $@ |
| 233 |
$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o |
| 234 |
|
| 235 |
|
| 236 |
|
| 237 |
1.1 x11-libs/fltk/files/fltk-1.1.9-desktop.patch |
| 238 |
|
| 239 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-desktop.patch?rev=1.1&view=markup |
| 240 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-desktop.patch?rev=1.1&content-type=text/plain |
| 241 |
|
| 242 |
Index: fltk-1.1.9-desktop.patch |
| 243 |
=================================================================== |
| 244 |
--- fltk-1.1.9.orig/fluid/fluid.desktop 2009-01-08 17:53:51.000000000 +0000 |
| 245 |
+++ fltk-1.1.9/fluid/fluid.desktop 2009-01-09 18:46:27.000000000 +0000 |
| 246 |
@@ -2,9 +2,9 @@ |
| 247 |
Name=FLUID |
| 248 |
Comment=FLTK GUI Designer |
| 249 |
TryExec=fluid |
| 250 |
-Exec=cd %D && fluid %F |
| 251 |
+Exec=fluid %F |
| 252 |
Icon=fluid |
| 253 |
Terminal=false |
| 254 |
Type=Application |
| 255 |
-MimeType=application/x-fluid |
| 256 |
+MimeType=application/x-fluid; |
| 257 |
Categories=Development;GUIDesigner; |
Archives