[PATCH v4] Don't install the actual icon files
Dirk Hohndel
dirk at hohndel.org
Thu Dec 12 13:19:59 UTC 2013
I finally get it. My last push failed and so this commit hadn't gone out
- even though I thought I had pushed it last night.
I'll push again in a minute with all the changes I made on the plane...
Do you want to send the patch that converts the xslt into resources as
well?
/D
On Thu, 2013-12-12 at 11:57 -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 | 10 ++--------
> 2 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in
> index 272b531..aa08382 100644
> --- a/packaging/windows/subsurface.nsi.in
> +++ b/packaging/windows/subsurface.nsi.in
> @@ -102,7 +102,6 @@ Section
> File /r xslt
> File /r data
> File /r images
> - File /r icons
> File /r plugins
> File /r Documentation
> File /r translations
> @@ -165,7 +164,6 @@ Section "Uninstall"
> RMDir /r "$INSTDIR\share"
> RMDir /r "$INSTDIR\xslt"
> 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 1fdacbe..01517ee 100644
> --- a/subsurface-install.pri
> +++ b/subsurface-install.pri
> @@ -1,6 +1,5 @@
> marbledir.files = $$MARBLEDIR
> xslt.files = $$XSLT_FILES
> -icons.files = $$ICONS_FILES
> doc.files = $$DOC_FILES
> translation.files = $$replace(TRANSLATIONS, .ts, .qm)
> exists($$[QT_INSTALL_TRANSLATIONS]) {
> @@ -56,7 +55,7 @@ mac {
> doc.path = $$WINDOWSSTAGING/Documentation
> CONFIG -= copy_dir_files
> deploy.path = $$WINDOWSSTAGING
> - deploy.files += $$xslt.files $$icons.files
> + deploy.files += $$xslt.files
> deploy.CONFIG += no_check_exist
> target.path = $$WINDOWSSTAGING
> marbledir.path = $$WINDOWSSTAGING/data
> @@ -134,8 +133,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}\
> XSLTDIR = $(DATADIR)/subsurface
> QMAKE_EXTRA_TARGETS += dummy
> @@ -150,9 +147,6 @@ XSLTDIR = $(DATADIR)/subsurface
> manpage.path = /$(MANDIR)
> manpage.files = $$MANPAGE
>
> - icon.path = /$(ICONDIR)
> - icon.files = $$ICON
> -
> xslt.path = /$(XSLTDIR)
> marbledir.path = /$(DATADIR)/subsurface/data
> doc.path = /$(DOCDIR)
> @@ -162,7 +156,7 @@ XSLTDIR = $(DATADIR)/subsurface
> translation.path = /$(DATADIR)/subsurface/translations
> translation.CONFIG += no_check_exist
>
> - INSTALLS += target desktop icon manpage xslt doc marbledir translation
> + INSTALLS += target desktop manpage xslt doc marbledir translation
> install.target = install
> }
> !isEmpty(TRANSLATIONS) {
More information about the subsurface
mailing list