callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Embed manifest into gtk-update-icon-cache.exe

Browse Source 
This way it doesn't need to be installed alongside it.

https://bugzilla.gnome.org/show_bug.cgi?id=705054
This commit is contained in:
Руслан Ижбулатов
2014-07-31 10:05:29 +00:00
parent 0ed766ec86
commit 7fd90804fb
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/Makefile.am
View File

@ -1639,12 +1639,12 @@ if OS_WIN32
# Workaround for UAC silliness: programs with "update" in their name # Workaround for UAC silliness: programs with "update" in their name
# are believed to be installers and require elevated privileges to be # are believed to be installers and require elevated privileges to be
# used... Use a manifest file to tell Windows that # used... Embed a manifest file into executable to tell Windows that
# gtk-update-icon-cache.exe doesn't require any special privileges. # gtk-update-icon-cache.exe doesn't require any special privileges.
GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
bin_SCRIPTS = $(GTK_UPDATE_ICON_CACHE_MANIFEST) GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
$(GTK_UPDATE_ICON_CACHE_MANIFEST): $(GTK_UPDATE_ICON_CACHE_MANIFEST):
(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \ (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
@ -1665,6 +1665,12 @@ $(GTK_UPDATE_ICON_CACHE_MANIFEST):
echo ' </trustInfo>' ; \ echo ' </trustInfo>' ; \
echo '</assembly>' ) >$@ echo '</assembly>' ) >$@
$(GTK_UPDATE_ICON_CACHE_RC):
(echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
$(WINDRES) --input $< --output $@ --output-format=coff
endif endif
endif endif
@ -1673,7 +1679,8 @@ gtk_query_immodules_3_0_LDADD = $(LDADDS) $(GMODULE_LIBS)
gtk_query_immodules_3_0_SOURCES = queryimmodules.c gtk_query_immodules_3_0_SOURCES = queryimmodules.c
if BUILD_ICON_CACHE if BUILD_ICON_CACHE
gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
gtk_update_icon_cache_DEPENDENCIES = $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
gtk_update_icon_cache_SOURCES = updateiconcache.c gtk_update_icon_cache_SOURCES = updateiconcache.c
endif endif