[PATCH v2] Don't install the actual icon files
Dirk Hohndel
dirk at hohndel.org
Wed Dec 11 22:59:43 UTC 2013
This doesn't apply cleanly. Easy to fix but this surprises me from
you... so is there a patch that I've missed?
Please check that what I have in master and what you think should be in
master are the same :-)
Thanks
/D
On Wed, 2013-12-11 at 19:09 -0800, Thiago Macieira wrote:
> They are loaded into a Qt resource and always accessed via it.
>
> Signed-off-by: Thiago Macieira <thiago at macieira.org>
> ---
> packaging/windows/subsurface.nsi.in | 2 --
> subsurface-install.pri | 7 -------
> 2 files changed, 9 deletions(-)
>
> diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in
> index b5722da..b29d872 100644
> --- a/packaging/windows/subsurface.nsi.in
> +++ b/packaging/windows/subsurface.nsi.in
> @@ -101,7 +101,6 @@ Section
> File subsurface.exe
> File /r data
> File /r images
> - File /r icons
> File /r plugins
> File /r Documentation
> File /r translations
> @@ -162,7 +161,6 @@ Section "Uninstall"
> Delete "$INSTDIR\qt.conf"
> RMDir /r "$INSTDIR\share"
> RMDir /r "$INSTDIR\data"
> - RMDir /r "$INSTDIR\icons"
> RMDir /r "$INSTDIR\images"
> RMDir /r "$INSTDIR\translations"
> RMDir /r "$INSTDIR\oldshare"
> diff --git a/subsurface-install.pri b/subsurface-install.pri
> index 88f28e7..4cfa181 100644
> --- a/subsurface-install.pri
> +++ b/subsurface-install.pri
> @@ -1,5 +1,4 @@
> marbledir.files = $$MARBLEDIR
> -icons.files = $$ICONS_FILES
> doc.files = $$DOC_FILES
> translation.files = $$replace(TRANSLATIONS, .ts, .qm)
> exists($$[QT_INSTALL_TRANSLATIONS]) {
> @@ -54,7 +53,6 @@ mac {
> doc.path = $$WINDOWSSTAGING/Documentation
> CONFIG -= copy_dir_files
> deploy.path = $$WINDOWSSTAGING
> - deploy.files += $$icons.files
> deploy.CONFIG += no_check_exist
> target.path = $$WINDOWSSTAGING
> marbledir.path = $$WINDOWSSTAGING/data
> @@ -132,8 +130,6 @@ BINDIR = $(prefix)/bin$${nl}\
> DATADIR = $(prefix)/share$${nl}\
> DOCDIR = $(DATADIR)/doc/subsurface$${nl}\
> DESKTOPDIR = $(DATADIR)/applications$${nl}\
> -ICONPATH = $(DATADIR)/icons/hicolor$${nl}\
> -ICONDIR = $(ICONPATH)/scalable/apps$${nl}\
> MANDIR = $(DATADIR)/man/man1$${nl}\
> QMAKE_EXTRA_TARGETS += dummy
>
> @@ -147,9 +143,6 @@ MANDIR = $(DATADIR)/man/man1$${nl}\
> manpage.path = /$(MANDIR)
> manpage.files = $$MANPAGE
>
> - icon.path = /$(ICONDIR)
> - icon.files = $$ICON
> -
> marbledir.path = /$(DATADIR)/subsurface/data
> doc.path = /$(DOCDIR)
>
More information about the subsurface
mailing list