Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 15:32:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

STR 1795: applied patch to fix Icon path settings. Will try on my Linux machine next.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6045 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2008-02-25 14:43:34 +00:00
parent cf2e50b8c3
commit 5382d3c8d5
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -6,6 +6,7 @@ CHANGES IN FLTK 1.1.8
STR #1742, STR #1777, STR #1794, STR #1827, STR #1843, STR #1742, STR #1777, STR #1794, STR #1827, STR #1843,
STR #1796, STR #1815, STR #1726, STR #1753, STR #1855, STR #1796, STR #1815, STR #1726, STR #1753, STR #1855,
STR #1862, STR #1867, STR #1874) STR #1862, STR #1867, STR #1874)
- Fixed KDE/Gnome icon paths (STR #1795)
- Fixed Tab key to wrap around menu bars (STR #1877) - Fixed Tab key to wrap around menu bars (STR #1877)
- Fixed possible timer leak in Scrollbar (STR #1880) - Fixed possible timer leak in Scrollbar (STR #1880)
- Added documentation about the potential limitations - Added documentation about the potential limitations
fltk.list.in
+4 -4
View File
@@ -129,7 +129,7 @@ f 0444 root sys /Applications/fluid.app/Contents/Resources/fluid.icns fluid/flui
%postremove /bin/rm -rf /Applications/fluid.app %postremove /bin/rm -rf /Applications/fluid.app
%system !darwin %system !darwin
f 0444 root sys /usr/share/applnk/Development/fluid.desktop fluid/fluid.desktop f 0444 root sys /usr/share/applications/fluid.desktop fluid/fluid.desktop
f 0444 root sys /usr/share/icons/hicolor/16x16/apps/fluid.png fluid/icons/fluid-16.png f 0444 root sys /usr/share/icons/hicolor/16x16/apps/fluid.png fluid/icons/fluid-16.png
f 0444 root sys /usr/share/icons/hicolor/32x32/apps/fluid.png fluid/icons/fluid-32.png f 0444 root sys /usr/share/icons/hicolor/32x32/apps/fluid.png fluid/icons/fluid-32.png
f 0444 root sys /usr/share/icons/hicolor/48x48/apps/fluid.png fluid/icons/fluid-48.png f 0444 root sys /usr/share/icons/hicolor/48x48/apps/fluid.png fluid/icons/fluid-48.png
@@ -394,17 +394,17 @@ f 0444 root sys /Applications/sudoku.app/Contents/Resources/sudoku.icns test/sud
%system !darwin %system !darwin
f 0555 root sys $bindir/blocks test/blocks f 0555 root sys $bindir/blocks test/blocks
f 0444 root sys /usr/share/applnk/Games/blocks.desktop test/desktop/blocks.desktop f 0444 root sys /usr/share/applications/blocks.desktop test/desktop/blocks.desktop
f 0444 root sys /usr/share/icons/hicolor/32x32/apps/blocks.png test/icons/blocks-32.png f 0444 root sys /usr/share/icons/hicolor/32x32/apps/blocks.png test/icons/blocks-32.png
f 0444 root sys /usr/share/icons/hicolor/128x128/apps/blocks.png test/icons/blocks-128.png f 0444 root sys /usr/share/icons/hicolor/128x128/apps/blocks.png test/icons/blocks-128.png
f 0555 root sys $bindir/checkers test/checkers f 0555 root sys $bindir/checkers test/checkers
f 0444 root sys /usr/share/applnk/Games/checkers.desktop test/desktop/checkers.desktop f 0444 root sys /usr/share/applications/checkers.desktop test/desktop/checkers.desktop
f 0444 root sys /usr/share/icons/hicolor/32x32/apps/checkers.png test/icons/checkers-32.png f 0444 root sys /usr/share/icons/hicolor/32x32/apps/checkers.png test/icons/checkers-32.png
f 0444 root sys /usr/share/icons/hicolor/128x128/apps/checkers.png test/icons/checkers-128.png f 0444 root sys /usr/share/icons/hicolor/128x128/apps/checkers.png test/icons/checkers-128.png
f 0555 root sys $bindir/sudoku test/sudoku f 0555 root sys $bindir/sudoku test/sudoku
f 0444 root sys /usr/share/applnk/Games/sudoku.desktop test/desktop/sudoku.desktop f 0444 root sys /usr/share/applications/sudoku.desktop test/desktop/sudoku.desktop
f 0444 root sys /usr/share/icons/hicolor/32x32/apps/sudoku.png test/icons/sudoku-32.png f 0444 root sys /usr/share/icons/hicolor/32x32/apps/sudoku.png test/icons/sudoku-32.png
f 0444 root sys /usr/share/icons/hicolor/128x128/apps/sudoku.png test/icons/sudoku-128.png f 0444 root sys /usr/share/icons/hicolor/128x128/apps/sudoku.png test/icons/sudoku-128.png
fltk.spec.in
+4 -4
View File
@@ -113,8 +113,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %{prefix}/share/doc/fltk %dir %{prefix}/share/doc/fltk
%{prefix}/share/doc/fltk/* %{prefix}/share/doc/fltk/*
%dir %{prefix}/share/applnk %dir %{prefix}/share/applications
%{prefix}/share/applnk/Development/* %{prefix}/share/applications/*
%dir %{prefix}/share/icons %dir %{prefix}/share/icons
%{prefix}/share/icons/hicolor/*/apps/fluid.png %{prefix}/share/icons/hicolor/*/apps/fluid.png
@@ -132,8 +132,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/cat6/* %{_mandir}/cat6/*
%{_mandir}/man6/* %{_mandir}/man6/*
%dir %{prefix}/share/applnk %dir %{prefix}/share/applications
%{prefix}/share/applnk/Games/* %{prefix}/share/applications/*
%dir %{prefix}/share/icons %dir %{prefix}/share/icons
%{prefix}/share/icons/hicolor/*/apps/blocks.png %{prefix}/share/icons/hicolor/*/apps/blocks.png
fluid/Makefile
+3 -3
View File
@@ -84,8 +84,8 @@ install: all
$(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
install-linux: install-linux:
-$(INSTALL_DIR) $(DESTDIR)/usr/share/applnk/Development -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
$(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applnk/Development $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applications
for size in 16 32 48 64 128; do \ for size in 16 32 48 64 128; do \
if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \ if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \
$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
@@ -111,7 +111,7 @@ uninstall:
$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT) $(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
uninstall-linux: uninstall-linux:
$(RM) $(DESTDIR)/usr/share/applnk/Development/fluid.desktop $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
$(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
test/Makefile
+3 -3
View File
@@ -203,12 +203,12 @@ install: all
install-linux: install-linux:
echo Installing games to $(DESTDIR)$(bindir)... echo Installing games to $(DESTDIR)$(bindir)...
-$(INSTALL_DIR) $(DESTDIR)$(bindir) -$(INSTALL_DIR) $(DESTDIR)$(bindir)
-$(INSTALL_DIR) $(DESTDIR)/usr/share/applnk/Games -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
-$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps -$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps
-$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps -$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps
for game in blocks checkers sudoku; do \ for game in blocks checkers sudoku; do \
$(INSTALL_BIN) $$game $(DESTDIR)$(bindir); \ $(INSTALL_BIN) $$game $(DESTDIR)$(bindir); \
$(INSTALL_DATA) desktop/$$game.desktop $(DESTDIR)/usr/share/applnk/Games; \ $(INSTALL_DATA) desktop/$$game.desktop $(DESTDIR)/usr/share/applications; \
$(INSTALL_DATA) desktop/$$game-32.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \ $(INSTALL_DATA) desktop/$$game-32.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \
$(INSTALL_DATA) desktop/$$game-128.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \ $(INSTALL_DATA) desktop/$$game-128.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \
done done
@@ -236,7 +236,7 @@ uninstall-linux:
echo Removing games from $(DESTDIR)$(bindir)... echo Removing games from $(DESTDIR)$(bindir)...
for game in blocks checkers sudoku; do \ for game in blocks checkers sudoku; do \
$(RM) $(DESTDIR)$(bindir)/$$game; \ $(RM) $(DESTDIR)$(bindir)/$$game; \
$(RM) $(DESTDIR)/usr/share/applnk/Games/$$game.desktop; \ $(RM) $(DESTDIR)/usr/share/applications/$$game.desktop; \
$(RM) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \ $(RM) $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/$$game.png; \
$(RM) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \ $(RM) $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/$$game.png; \
done done