From c37e071dc436030e4d7c2c6c3108670b501a81ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 2 Apr 2018 19:36:21 +0100 Subject: x11-libs/gtk+ : import from gentoo tree, overwrite default settings --- .../gtk+/files/gtk+-2.24.24-out-of-source.patch | 33 +++++ .../files/gtk+-2.24.31-fix-gtkentry-beep.patch | 42 +++++++ .../files/gtk+-2.24.31-update-icon-cache.patch | 78 ++++++++++++ .../gtk+/files/gtk+-3.22.2-update-icon-cache.patch | 138 +++++++++++++++++++++ x11-libs/gtk+/files/gtkrc | 39 ++++++ x11-libs/gtk+/files/gtkrc-2.0 | 15 +++ x11-libs/gtk+/files/settings.ini | 16 +++ 7 files changed, 361 insertions(+) create mode 100644 x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch create mode 100644 x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch create mode 100644 x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch create mode 100644 x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch create mode 100644 x11-libs/gtk+/files/gtkrc create mode 100644 x11-libs/gtk+/files/gtkrc-2.0 create mode 100644 x11-libs/gtk+/files/settings.ini (limited to 'x11-libs/gtk+/files') diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch new file mode 100644 index 00000000..451233ca --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch @@ -0,0 +1,33 @@ +From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sun, 18 May 2014 10:50:05 +0200 +Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir. + +The $gtk_all_c_sources variable contains both supplied and generated +sources. The former reside in $srcdir, the latter in the build directory +(cwd). + +In order to handle both kinds properly, first try to find each source +file in cwd, and then fallback to $srcdir. This makes it possible to use +out-of-source builds, and guarantees that fresh-built source files will +be used rather than pre-generated copies included in the distribution +tarball. +--- + gtk/aliasfilescheck.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh +index 31b49d4..3636a82 100755 +--- a/gtk/aliasfilescheck.sh ++++ b/gtk/aliasfilescheck.sh +@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then + fi + + grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files +-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files ++{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files + + diff expected-files actual-files && rm -f expected-files actual-files +-- +1.9.3 + diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch new file mode 100644 index 00000000..1d09721b --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch @@ -0,0 +1,42 @@ +From debba4d14155a9e5736de069c2b693ab6f6e21aa Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 5 Oct 2016 12:20:14 -0400 +Subject: [PATCH] entry: Fix a corner case of overwrite mode + +We currently beep when a character is appended at the end in +overwrite mode. That is obviously not right. Patch based on +a patch by Ian MacDonald. + +https://bugzilla.gnome.org/show_bug.cgi?id=772389 +--- + gtk/gtkentry.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c +index b522039..bc33754 100644 +--- a/gtk/gtkentry.c ++++ b/gtk/gtkentry.c +@@ -5224,6 +5224,7 @@ gtk_entry_enter_text (GtkEntry *entry, + GtkEditable *editable = GTK_EDITABLE (entry); + gint tmp_pos; + gboolean old_need_im_reset; ++ guint text_length; + + old_need_im_reset = entry->need_im_reset; + entry->need_im_reset = FALSE; +@@ -5233,7 +5234,11 @@ gtk_entry_enter_text (GtkEntry *entry, + else + { + if (entry->overwrite_mode) +- gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); ++ { ++ text_length = gtk_entry_buffer_get_length (get_buffer (entry)); ++ if (entry->current_pos < text_length) ++ gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); ++ } + } + + tmp_pos = entry->current_pos; +-- +2.10.0 + diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch new file mode 100644 index 00000000..11dbb5e4 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch @@ -0,0 +1,78 @@ +From 260f94f3914ba18a256e6f1c222f643a57854e80 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Sat, 9 May 2015 23:30:58 +0200 +Subject: [PATCH] Always use external gtk-update-icon-cache + +--- + configure.ac | 8 +++----- + docs/reference/gtk/Makefile.am | 2 +- + gtk/Makefile.am | 13 ++----------- + 3 files changed, 6 insertions(+), 17 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4e11b40..7ef8cb6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling + + AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) + +-if test $cross_compiling = yes; then +- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) +- if test x$GTK_UPDATE_ICON_CACHE = xno; then +- REBUILD_PNGS=# +- fi ++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) ++if test x$GTK_UPDATE_ICON_CACHE = xno; then ++ REBUILD_PNGS=# + fi + + AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) +diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am +index c239445..60b5265 100644 +--- a/docs/reference/gtk/Makefile.am ++++ b/docs/reference/gtk/Makefile.am +@@ -368,7 +368,7 @@ EXTRA_DIST += version.xml.in + + if ENABLE_MAN + +-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 ++man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1 + + %.1 : %.xml + @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 8cc4536..a7afbf3 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -1087,8 +1087,7 @@ endif + # Installed tools + # + bin_PROGRAMS = \ +- gtk-query-immodules-2.0 \ +- gtk-update-icon-cache ++ gtk-query-immodules-2.0 + + bin_SCRIPTS = gtk-builder-convert + +@@ -1438,16 +1437,8 @@ stamp-icons: $(STOCK_ICONS) + ) done \ + && touch stamp-icons + +-if CROSS_COMPILING +-gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) +-else +-gtk_update_icon_cache_program = \ +- ./gtk-update-icon-cache +-endif +- + gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) +- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ ++ $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \ + --include-image-data \ + --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ + mv gtkbuiltincache.h.tmp gtkbuiltincache.h +-- +2.10.0 + diff --git a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch new file mode 100644 index 00000000..fc1e86e9 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch @@ -0,0 +1,138 @@ +From 101b43f4a38904ee21070a3e2eb5ba03dfe17647 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Tue, 1 Nov 2016 15:24:22 +0100 +Subject: [PATCH] Always use external gtk-update-icon-cache + +Check for gtk-update-icon-cache to install demos, otherwise it is not +used when building. +--- + configure.ac | 2 ++ + demos/gtk-demo/Makefile.am | 2 +- + demos/widget-factory/Makefile.am | 2 +- + docs/reference/gtk/Makefile.am | 1 - + gtk/Makefile.am | 44 ---------------------------------------- + 5 files changed, 4 insertions(+), 47 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4f9f183..ecf99dc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -999,6 +999,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling + + AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) + ++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no]) ++ + ######################################## + # Windowing system checks + ######################################## +diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am +index 8c15e16..5d774d2 100644 +--- a/demos/gtk-demo/Makefile.am ++++ b/demos/gtk-demo/Makefile.am +@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy + dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png + dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png + +-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force ++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force + + install-data-hook: install-update-icon-cache + uninstall-hook: uninstall-update-icon-cache +diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am +index a6bfbdc..28a3be2 100644 +--- a/demos/widget-factory/Makefile.am ++++ b/demos/widget-factory/Makefile.am +@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget + dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png + dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png + +-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force ++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force + + install-data-hook: install-update-icon-cache + uninstall-hook: uninstall-update-icon-cache +diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am +index 5a88a12..b51f3ac 100644 +--- a/docs/reference/gtk/Makefile.am ++++ b/docs/reference/gtk/Makefile.am +@@ -504,7 +504,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in + + man_MANS = \ + gtk-query-immodules-3.0.1 \ +- gtk-update-icon-cache.1 \ + gtk-encode-symbolic-svg.1 \ + gtk-launch.1 \ + gtk3-demo.1 \ +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 3b76b82..d4c5681 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -1581,7 +1581,6 @@ endif + # + bin_PROGRAMS = \ + gtk-query-immodules-3.0 \ +- gtk-update-icon-cache \ + gtk-encode-symbolic-svg \ + gtk-builder-tool \ + gtk-query-settings \ +@@ -1594,9 +1593,6 @@ gtk_query_immodules_3_0_LDADD = \ + $(GMODULE_LIBS) \ + $(GTK_DEP_LIBS) + +-gtk_update_icon_cache_SOURCES = updateiconcache.c +-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) +- + gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c + gtk_encode_symbolic_svg_LDADD = \ + $(GDK_PIXBUF_LIBS) \ +@@ -1621,46 +1617,6 @@ gtk_launch_LDADD = \ + $(top_builddir)/gdk/libgdk-3.la \ + $(GTK_DEP_LIBS) + +-if OS_WIN32 +- +-# Workaround for UAC silliness: programs with "update" in their name +-# are believed to be installers and require elevated privileges to be +-# 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_MANIFEST = gtk-update-icon-cache.exe.manifest +-GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc +-GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o +- +-$(GTK_UPDATE_ICON_CACHE_MANIFEST): +- (echo '' ; \ +- echo '' ; \ +- echo ' ' ; \ +- echo ' ' ; \ +- echo ' ' ; \ +- echo ' ' ; \ +- echo ' ' ; \ +- echo ' ' ; \ +- echo ' ' ; \ +- echo ' ' ; \ +- echo ' ' ; \ +- echo '' ) >$@ +- +-$(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 +- +-gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT) +- +-endif +- + .PHONY: files + + files: +-- +2.10.1 + diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc new file mode 100644 index 00000000..8d178343 --- /dev/null +++ b/x11-libs/gtk+/files/gtkrc @@ -0,0 +1,39 @@ +style "default" + +{ + font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*" +} + +style "button" = "default" + +{ + bg[PRELIGHT] = { 0.7, 0.7, 0.9 } +} + +style "treeitem" +{ +bg[ACTIVE] = { 0.7, 0.7, 0.9 } +} + +style "scrollbar" = "button" +{ + bg[ACTIVE] = {0.6, 0.6, 0.6 } +} + +style "status" { + bg[PRELIGHT] = { 0.3, 1.0, 0.3 } +} + +style "gtk-tooltips" { + bg[NORMAL] = "#ffff60" +} + +class "GtkWidget" style "default" +class "GtkButton" style "button" +class "GtkItem" style "button" +class "GtkProgressBar" style "status" +class "GtkScrollbar" style "scrollbar" +class "GtkTreeItem" style "treeitem" +widget "gtk-tooltips" style "gtk-tooltips" + + diff --git a/x11-libs/gtk+/files/gtkrc-2.0 b/x11-libs/gtk+/files/gtkrc-2.0 new file mode 100644 index 00000000..46e58525 --- /dev/null +++ b/x11-libs/gtk+/files/gtkrc-2.0 @@ -0,0 +1,15 @@ +gtk-theme-name="Redcore-nighttime" +gtk-icon-theme-name="material-design-dark" +gtk-font-name="Roboto 9" +gtk-cursor-theme-name="Hacked-Red" +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle="hintfull" +gtk-xft-rgba="rgb" diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini new file mode 100644 index 00000000..cb18b0af --- /dev/null +++ b/x11-libs/gtk+/files/settings.ini @@ -0,0 +1,16 @@ +[Settings] +gtk-theme-name=Redcore-nighttime +gtk-icon-theme-name=material-design-dark +gtk-font-name=Roboto 9 +gtk-cursor-theme-size=0 +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=1 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintfull +gtk-xft-rgba=rgb +gtk-cursor-theme-name=Hacked-Red -- cgit v1.2.3