gtk3-nocsd: provide a way for per-application integration

Alexander Pyhalov

2017-11-07 f85657a57c977300049a41eb0bc2ae1af28e8ea5

gtk3-nocsd: provide a way for per-application integration

 components/desktop/gnome3/devhelp/Makefile

@@ -18,6 +18,7 @@
COMPONENT_NAME= devhelp
COMPONENT_MJR_VERSION= 3.18
COMPONENT_MNR_VERSION= 0
COMPONENT_REVISION= 1 
COMPONENT_VERSION= $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
COMPONENT_SUMMARY= API documentation browser for GNOME
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)

 components/desktop/gnome3/devhelp/devhelp.p5m

@@ -22,7 +22,15 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/devhelp
depend type=require fmri=library/desktop/gtk3/gtk3-nocsd

link path=usr/bin/devhelp target=../lib/csd/devhelp \
    mediator=nocsd mediator-implementation=disable
link path=usr/bin/devhelp target=gtk3-nocsd \
    mediator=nocsd mediator-implementation=gtk3-nocsd \
    pkg.linted.userland.action002.0=true
file usr/bin/devhelp path=usr/lib/csd/devhelp mode=0555

file path=usr/include/devhelp-3.0/devhelp/devhelp.h
file path=usr/include/devhelp-3.0/devhelp/dh-app.h
file path=usr/include/devhelp-3.0/devhelp/dh-assistant-view.h

 components/library/gtk3-nocsd/Makefile

@@ -17,6 +17,7 @@

COMPONENT_NAME=        gtk3-nocsd
COMPONENT_VERSION=    3
COMPONENT_REVISION=    1
COMPONENT_FMRI=        library/desktop/gtk3/gtk3-nocsd
COMPONENT_SUMMARY=    A small module used to disable the client side decoration of Gtk+ 3
COMPONENT_CLASSIFICATION=Applications/Plug-ins and Run-times
@@ -47,13 +48,9 @@
COMPONENT_INSTALL_ENV += libdir=$(LIBDIR.$(BITS))
COMPONENT_INSTALL_ENV += bashcompletiondir=/usr/share/bash-completion/completions

$(PROTO_DIR)/etc/X11/xinit/xinitrc.d/0310.gtk3-nocsd: $(INSTALL_32_and_64) $(COMPONENT_DIR)/files/gtk3-nocsd
    $(MKDIR) $(dir $@)
    $(GSED) -e 's:%MACH64%:$(MACH64):g' $(COMPONENT_DIR)/files/gtk3-nocsd > $@

build: $(BUILD_32_and_64)

install: $(INSTALL_32_and_64) $(PROTO_DIR)/etc/X11/xinit/xinitrc.d/0310.gtk3-nocsd
install: $(INSTALL_32_and_64)

test: $(NO_TESTS)


 components/library/gtk3-nocsd/files/gtk3-nocsd

File was deleted

 components/library/gtk3-nocsd/gtk3-nocsd.p5m

@@ -22,9 +22,6 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=etc/X11/xinit/xinitrc.d/0310.gtk3-nocsd mode=0555 preserve=true

file path=usr/bin/$(MACH64)/gtk3-nocsd
file path=usr/bin/gtk3-nocsd
file path=usr/lib/$(MACH64)/libgtk3-nocsd.so.0
file path=usr/lib/libgtk3-nocsd.so.0

 components/library/gtk3-nocsd/patches/01-csd-path.patch

New file
@@ -0,0 +1,11 @@
--- gtk3-nocsd-3/gtk3-nocsd.in.1    2017-11-07 08:20:42.579095542 +0000
+++ gtk3-nocsd-3/gtk3-nocsd.in    2017-11-07 08:29:36.672144975 +0000
@@ -72,7 +72,7 @@
 
 # Find the real program (the first one that's not symlinked to get3-nocsd)
 APPNAME="$(basename "$0")"
-for APPPATH in $(which -a "$APPNAME") /bin/false; do
+for APPPATH in /usr/lib/csd/"${APPNAME}" $(which -a "$APPNAME") /bin/false; do
     APPPATH_LINK="$(readlink -fe "$APPPATH")"
     [ x"${APPPATH_LINK##*/}"x = x"gtk3-nocsd"x ] || break
 done

 transforms/defaults

@@ -162,6 +162,11 @@
<transform link mediator=java mediator-version=8 -> default mediator-priority vendor>

#
# Disable gtk3 csd by default
#
<transform link mediator=nocsd mediator-implementation=gtk3-nocsd -> default mediator-priority vendor>

#
# Add a facet.version-lock.{package} to each 'optional' consolidation
# incorporation dependency so that we can install without having to
# mangle the system in some way.