Date: Saturday, January 14, 2017 @ 17:52:46 Author: demize Revision: 207370
archrelease: copy trunk to community-i686, community-x86_64 Added: girara/repos/community-i686/PKGBUILD (from rev 207369, girara/trunk/PKGBUILD) girara/repos/community-i686/fix-font-handling-gtk-3.21.patch (from rev 207369, girara/trunk/fix-font-handling-gtk-3.21.patch) girara/repos/community-i686/revert-incorrect-changes.patch (from rev 207369, girara/trunk/revert-incorrect-changes.patch) girara/repos/community-x86_64/PKGBUILD (from rev 207369, girara/trunk/PKGBUILD) girara/repos/community-x86_64/fix-font-handling-gtk-3.21.patch (from rev 207369, girara/trunk/fix-font-handling-gtk-3.21.patch) girara/repos/community-x86_64/revert-incorrect-changes.patch (from rev 207369, girara/trunk/revert-incorrect-changes.patch) Deleted: girara/repos/community-i686/PKGBUILD girara/repos/community-i686/fix-font-handling-gtk-3.21.patch girara/repos/community-i686/revert-incorrect-changes.patch girara/repos/community-x86_64/PKGBUILD girara/repos/community-x86_64/fix-font-handling-gtk-3.21.patch girara/repos/community-x86_64/revert-incorrect-changes.patch ---------------------------------------------------+ /PKGBUILD | 80 ++++ /fix-font-handling-gtk-3.21.patch | 380 ++++++++++++++++++++ /revert-incorrect-changes.patch | 60 +++ community-i686/PKGBUILD | 45 -- community-i686/fix-font-handling-gtk-3.21.patch | 190 ---------- community-i686/revert-incorrect-changes.patch | 30 - community-x86_64/PKGBUILD | 40 -- community-x86_64/fix-font-handling-gtk-3.21.patch | 190 ---------- community-x86_64/revert-incorrect-changes.patch | 30 - 9 files changed, 520 insertions(+), 525 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-01-14 17:51:49 UTC (rev 207369) +++ community-i686/PKGBUILD 2017-01-14 17:52:46 UTC (rev 207370) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: mlq <m...@pwmt.org> - -pkgname=girara -pkgver=0.2.6 -pkgrel=3 - -pkgdesc="User interface library focused on simplicity and minimalism" -url="http://pwmt.org/projects/girara" -arch=('i686' 'x86_64') -license=('custom') - -provides=('girara-gtk3' 'girara-common') -replaces=('girara-gtk3' 'girara-common') -conflicts=('girara-gtk3' 'girara-common') - -depends=('gtk3') - -source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz - fix-font-handling-gtk-3.21.patch - revert-incorrect-changes.patch) -sha1sums=('674e4294fe091fe93a1c186d95b3263b30cd8a5e' - '609f469dc6ad4570959dea028fd36f8ba8562231' - '21b31fe5589fa127772cb3cc29a461fd0b24ac08') - -prepare() { - cd girara-$pkgver - patch -p1 <"$srcdir"/fix-font-handling-gtk-3.21.patch - patch -p1 <"$srcdir"/revert-incorrect-changes.patch -} - -build() { - cd girara-$pkgver - touch colors.mk - make GIRARA_GTK_VERSION=3 -} - -package() { - cd girara-$pkgver - make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install - install -D -m664 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} Copied: girara/repos/community-i686/PKGBUILD (from rev 207369, girara/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-01-14 17:52:46 UTC (rev 207370) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: mlq <m...@pwmt.org> + +pkgname=girara +pkgver=0.2.7 +pkgrel=1 + +pkgdesc="User interface library focused on simplicity and minimalism" +url="http://pwmt.org/projects/girara" +arch=('i686' 'x86_64') +license=('custom') + +provides=('girara-gtk3' 'girara-common') +replaces=('girara-gtk3' 'girara-common') +conflicts=('girara-gtk3' 'girara-common') + +depends=('gtk3') + +source=(https://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) + +sha1sums=('d868a6fc55a155cc043e17e5da31b8440e7babf0') + +prepare() { + cd girara-$pkgver +} + +build() { + cd girara-$pkgver + touch colors.mk + make GIRARA_GTK_VERSION=3 +} + +package() { + cd girara-$pkgver + make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install + install -D -m664 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} Deleted: community-i686/fix-font-handling-gtk-3.21.patch =================================================================== --- community-i686/fix-font-handling-gtk-3.21.patch 2017-01-14 17:51:49 UTC (rev 207369) +++ community-i686/fix-font-handling-gtk-3.21.patch 2017-01-14 17:52:46 UTC (rev 207370) @@ -1,190 +0,0 @@ -From 949c879aa84e9496fabc7d3602060e29f9dc42a1 Mon Sep 17 00:00:00 2001 -From: Sebastian Ramacher <sebastian+...@ramacher.at> -Date: Sat, 3 Sep 2016 11:54:53 +0200 -Subject: [PATCH] Update font handling for changes in Gtk+ 3.21 - -Signed-off-by: Sebastian Ramacher <sebastian+...@ramacher.at> ---- - data/girara-post-3.20.css_t | 11 ++++++++++- - girara/config.c | 3 +-- - girara/internal.h | 2 ++ - girara/session.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- - 4 files changed, 103 insertions(+), 6 deletions(-) - -diff --git a/data/girara-post-3.20.css_t b/data/girara-post-3.20.css_t -index 491e08e..29758de 100644 ---- a/data/girara-post-3.20.css_t -+++ b/data/girara-post-3.20.css_t -@@ -2,7 +2,15 @@ - color: @default-fg@; - background-color: @default-bg@; - background-image: none; -- font: @font@; -+ font-family: @font-family@; -+ font-size: @font-size@; -+ font-weight: @font-weight@; -+ box-shadow: none; -+ border-style: none; -+ margin: 0px; -+ padding: @bottombox-padding1@px @bottombox-padding2@px @bottombox-padding3@px -+ @bottombox-padding4@px; -+ - } - - /* Scrollbar */ -@@ -114,4 +122,5 @@ - #@session@ scrolledwindow overshoot.right, - #@session@ scrolledwindow overshoot.right:backdrop { - background-color: transparent; -+ background-image: none; - } -diff --git a/girara/config.c b/girara/config.c -index 4e4092a..63127e8 100644 ---- a/girara/config.c -+++ b/girara/config.c -@@ -50,8 +50,7 @@ cb_font(girara_session_t* session, const char* UNUSED(name), - { - g_return_if_fail(session != NULL && value != NULL); - -- girara_template_set_variable_value(session->private_data->csstemplate, "font", -- value); -+ css_template_fill_font(session->private_data->csstemplate, value); - } - - static void -diff --git a/girara/internal.h b/girara/internal.h -index dac88b5..8e2d754 100644 ---- a/girara/internal.h -+++ b/girara/internal.h -@@ -148,6 +148,8 @@ HIDDEN bool girara_cmd_dump_config(girara_session_t* session, - HIDDEN bool girara_sc_feedkeys(girara_session_t* session, girara_argument_t* argument, - girara_event_t* event, unsigned int t); - -+HIDDEN void css_template_fill_font(GiraraTemplate* csstemplate, const char* font); -+ - /** - * Structure of a command - */ -diff --git a/girara/session.c b/girara/session.c -index b313f4d..2172fc7 100644 ---- a/girara/session.c -+++ b/girara/session.c -@@ -44,7 +44,6 @@ init_template_engine(GiraraTemplate* csstemplate) - { - static const char* variable_names[] = { - "session", -- "font", - "default-fg", - "default-bg", - "inputbar-fg", -@@ -78,6 +77,88 @@ init_template_engine(GiraraTemplate* csstemplate) - for (size_t idx = 0; idx < LENGTH(variable_names); ++idx) { - girara_template_add_variable(csstemplate, variable_names[idx]); - } -+ -+ if (gtk_check_version(3, 20, 0) == NULL) { -+ girara_template_add_variable(csstemplate, "font-family"); -+ girara_template_add_variable(csstemplate, "font-size"); -+ girara_template_add_variable(csstemplate, "font-weight"); -+ } else { -+ girara_template_add_variable(csstemplate, "font"); -+ } -+} -+ -+void -+css_template_fill_font(GiraraTemplate* csstemplate, const char* font) -+{ -+ if (gtk_check_version(3, 20, 0) != NULL) { -+ girara_template_set_variable_value(csstemplate, "font", font); -+ return; -+ } -+ -+ PangoFontDescription* descr = pango_font_description_from_string(font); -+ if (descr == NULL) { -+ return; -+ } -+ -+ girara_template_set_variable_value(csstemplate, "font-family", -+ pango_font_description_get_family(descr)); -+ -+ char* size = g_strdup_printf("%d%s", pango_font_description_get_size(descr) / PANGO_SCALE, -+ pango_font_description_get_size_is_absolute(descr) == FALSE ? "pt" : ""); -+ girara_template_set_variable_value(csstemplate, "font-size", size); -+ g_free(size); -+ -+ switch (pango_font_description_get_weight(descr)) { -+ case PANGO_WEIGHT_THIN: -+ girara_template_set_variable_value(csstemplate, "font-weight", "thin"); -+ break; -+ -+ case PANGO_WEIGHT_ULTRALIGHT: -+ girara_template_set_variable_value(csstemplate, "font-weight", "ultralight"); -+ break; -+ -+ case PANGO_WEIGHT_SEMILIGHT: -+ girara_template_set_variable_value(csstemplate, "font-weight", "light"); -+ break; -+ -+ case PANGO_WEIGHT_LIGHT: -+ girara_template_set_variable_value(csstemplate, "font-weight", "light"); -+ break; -+ -+ case PANGO_WEIGHT_BOOK: -+ girara_template_set_variable_value(csstemplate, "font-weight", "book"); -+ break; -+ -+ case PANGO_WEIGHT_MEDIUM: -+ girara_template_set_variable_value(csstemplate, "font-weight", "medium"); -+ break; -+ -+ case PANGO_WEIGHT_SEMIBOLD: -+ girara_template_set_variable_value(csstemplate, "font-weight", "semibold"); -+ break; -+ -+ case PANGO_WEIGHT_BOLD: -+ girara_template_set_variable_value(csstemplate, "font-weight", "bold"); -+ break; -+ -+ case PANGO_WEIGHT_ULTRABOLD: -+ girara_template_set_variable_value(csstemplate, "font-weight", "ultrabold"); -+ break; -+ -+ case PANGO_WEIGHT_HEAVY: -+ girara_template_set_variable_value(csstemplate, "font-weight", "heavy"); -+ break; -+ -+ case PANGO_WEIGHT_ULTRAHEAVY: -+ girara_template_set_variable_value(csstemplate, "font-weight", "ultraheavy"); -+ break; -+ -+ default: -+ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); -+ break; -+ } -+ -+ pango_font_description_free(descr); - } - - static void -@@ -91,10 +172,16 @@ fill_template_with_values(girara_session_t* session) - char* font = NULL; - girara_setting_get(session, "font", &font); - if (font != NULL) { -- girara_template_set_variable_value(csstemplate, "font", font); -+ css_template_fill_font(csstemplate, font); - g_free(font); - } else { -- girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); -+ if (gtk_check_version(3, 20, 0) == NULL) { -+ girara_template_set_variable_value(csstemplate, "font-family", "monospace"); -+ girara_template_set_variable_value(csstemplate, "font-size", "9pt"); -+ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); -+ } else { -+ girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); -+ } - }; - - /* parse color values */ --- -libgit2 0.24.0 - Copied: girara/repos/community-i686/fix-font-handling-gtk-3.21.patch (from rev 207369, girara/trunk/fix-font-handling-gtk-3.21.patch) =================================================================== --- community-i686/fix-font-handling-gtk-3.21.patch (rev 0) +++ community-i686/fix-font-handling-gtk-3.21.patch 2017-01-14 17:52:46 UTC (rev 207370) @@ -0,0 +1,190 @@ +From 949c879aa84e9496fabc7d3602060e29f9dc42a1 Mon Sep 17 00:00:00 2001 +From: Sebastian Ramacher <sebastian+...@ramacher.at> +Date: Sat, 3 Sep 2016 11:54:53 +0200 +Subject: [PATCH] Update font handling for changes in Gtk+ 3.21 + +Signed-off-by: Sebastian Ramacher <sebastian+...@ramacher.at> +--- + data/girara-post-3.20.css_t | 11 ++++++++++- + girara/config.c | 3 +-- + girara/internal.h | 2 ++ + girara/session.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 4 files changed, 103 insertions(+), 6 deletions(-) + +diff --git a/data/girara-post-3.20.css_t b/data/girara-post-3.20.css_t +index 491e08e..29758de 100644 +--- a/data/girara-post-3.20.css_t ++++ b/data/girara-post-3.20.css_t +@@ -2,7 +2,15 @@ + color: @default-fg@; + background-color: @default-bg@; + background-image: none; +- font: @font@; ++ font-family: @font-family@; ++ font-size: @font-size@; ++ font-weight: @font-weight@; ++ box-shadow: none; ++ border-style: none; ++ margin: 0px; ++ padding: @bottombox-padding1@px @bottombox-padding2@px @bottombox-padding3@px ++ @bottombox-padding4@px; ++ + } + + /* Scrollbar */ +@@ -114,4 +122,5 @@ + #@session@ scrolledwindow overshoot.right, + #@session@ scrolledwindow overshoot.right:backdrop { + background-color: transparent; ++ background-image: none; + } +diff --git a/girara/config.c b/girara/config.c +index 4e4092a..63127e8 100644 +--- a/girara/config.c ++++ b/girara/config.c +@@ -50,8 +50,7 @@ cb_font(girara_session_t* session, const char* UNUSED(name), + { + g_return_if_fail(session != NULL && value != NULL); + +- girara_template_set_variable_value(session->private_data->csstemplate, "font", +- value); ++ css_template_fill_font(session->private_data->csstemplate, value); + } + + static void +diff --git a/girara/internal.h b/girara/internal.h +index dac88b5..8e2d754 100644 +--- a/girara/internal.h ++++ b/girara/internal.h +@@ -148,6 +148,8 @@ HIDDEN bool girara_cmd_dump_config(girara_session_t* session, + HIDDEN bool girara_sc_feedkeys(girara_session_t* session, girara_argument_t* argument, + girara_event_t* event, unsigned int t); + ++HIDDEN void css_template_fill_font(GiraraTemplate* csstemplate, const char* font); ++ + /** + * Structure of a command + */ +diff --git a/girara/session.c b/girara/session.c +index b313f4d..2172fc7 100644 +--- a/girara/session.c ++++ b/girara/session.c +@@ -44,7 +44,6 @@ init_template_engine(GiraraTemplate* csstemplate) + { + static const char* variable_names[] = { + "session", +- "font", + "default-fg", + "default-bg", + "inputbar-fg", +@@ -78,6 +77,88 @@ init_template_engine(GiraraTemplate* csstemplate) + for (size_t idx = 0; idx < LENGTH(variable_names); ++idx) { + girara_template_add_variable(csstemplate, variable_names[idx]); + } ++ ++ if (gtk_check_version(3, 20, 0) == NULL) { ++ girara_template_add_variable(csstemplate, "font-family"); ++ girara_template_add_variable(csstemplate, "font-size"); ++ girara_template_add_variable(csstemplate, "font-weight"); ++ } else { ++ girara_template_add_variable(csstemplate, "font"); ++ } ++} ++ ++void ++css_template_fill_font(GiraraTemplate* csstemplate, const char* font) ++{ ++ if (gtk_check_version(3, 20, 0) != NULL) { ++ girara_template_set_variable_value(csstemplate, "font", font); ++ return; ++ } ++ ++ PangoFontDescription* descr = pango_font_description_from_string(font); ++ if (descr == NULL) { ++ return; ++ } ++ ++ girara_template_set_variable_value(csstemplate, "font-family", ++ pango_font_description_get_family(descr)); ++ ++ char* size = g_strdup_printf("%d%s", pango_font_description_get_size(descr) / PANGO_SCALE, ++ pango_font_description_get_size_is_absolute(descr) == FALSE ? "pt" : ""); ++ girara_template_set_variable_value(csstemplate, "font-size", size); ++ g_free(size); ++ ++ switch (pango_font_description_get_weight(descr)) { ++ case PANGO_WEIGHT_THIN: ++ girara_template_set_variable_value(csstemplate, "font-weight", "thin"); ++ break; ++ ++ case PANGO_WEIGHT_ULTRALIGHT: ++ girara_template_set_variable_value(csstemplate, "font-weight", "ultralight"); ++ break; ++ ++ case PANGO_WEIGHT_SEMILIGHT: ++ girara_template_set_variable_value(csstemplate, "font-weight", "light"); ++ break; ++ ++ case PANGO_WEIGHT_LIGHT: ++ girara_template_set_variable_value(csstemplate, "font-weight", "light"); ++ break; ++ ++ case PANGO_WEIGHT_BOOK: ++ girara_template_set_variable_value(csstemplate, "font-weight", "book"); ++ break; ++ ++ case PANGO_WEIGHT_MEDIUM: ++ girara_template_set_variable_value(csstemplate, "font-weight", "medium"); ++ break; ++ ++ case PANGO_WEIGHT_SEMIBOLD: ++ girara_template_set_variable_value(csstemplate, "font-weight", "semibold"); ++ break; ++ ++ case PANGO_WEIGHT_BOLD: ++ girara_template_set_variable_value(csstemplate, "font-weight", "bold"); ++ break; ++ ++ case PANGO_WEIGHT_ULTRABOLD: ++ girara_template_set_variable_value(csstemplate, "font-weight", "ultrabold"); ++ break; ++ ++ case PANGO_WEIGHT_HEAVY: ++ girara_template_set_variable_value(csstemplate, "font-weight", "heavy"); ++ break; ++ ++ case PANGO_WEIGHT_ULTRAHEAVY: ++ girara_template_set_variable_value(csstemplate, "font-weight", "ultraheavy"); ++ break; ++ ++ default: ++ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); ++ break; ++ } ++ ++ pango_font_description_free(descr); + } + + static void +@@ -91,10 +172,16 @@ fill_template_with_values(girara_session_t* session) + char* font = NULL; + girara_setting_get(session, "font", &font); + if (font != NULL) { +- girara_template_set_variable_value(csstemplate, "font", font); ++ css_template_fill_font(csstemplate, font); + g_free(font); + } else { +- girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); ++ if (gtk_check_version(3, 20, 0) == NULL) { ++ girara_template_set_variable_value(csstemplate, "font-family", "monospace"); ++ girara_template_set_variable_value(csstemplate, "font-size", "9pt"); ++ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); ++ } else { ++ girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); ++ } + }; + + /* parse color values */ +-- +libgit2 0.24.0 + Deleted: community-i686/revert-incorrect-changes.patch =================================================================== --- community-i686/revert-incorrect-changes.patch 2017-01-14 17:51:49 UTC (rev 207369) +++ community-i686/revert-incorrect-changes.patch 2017-01-14 17:52:46 UTC (rev 207370) @@ -1,30 +0,0 @@ -From 0b5406554e2304e012d975ee746e4ec27896701d Mon Sep 17 00:00:00 2001 -From: Sebastian Ramacher <sebastian+...@ramacher.at> -Date: Sat, 3 Sep 2016 12:00:49 +0200 -Subject: [PATCH] Revert unintended changes - -Signed-off-by: Sebastian Ramacher <sebastian+...@ramacher.at> ---- - data/girara-post-3.20.css_t | 6 ------ - 1 file changed, 0 insertions(+), 6 deletions(-) - -diff --git a/data/girara-post-3.20.css_t b/data/girara-post-3.20.css_t -index 29758de..1fdc4d2 100644 ---- a/data/girara-post-3.20.css_t -+++ b/data/girara-post-3.20.css_t -@@ -5,12 +5,6 @@ - font-family: @font-family@; - font-size: @font-size@; - font-weight: @font-weight@; -- box-shadow: none; -- border-style: none; -- margin: 0px; -- padding: @bottombox-padding1@px @bottombox-padding2@px @bottombox-padding3@px -- @bottombox-padding4@px; -- - } - - /* Scrollbar */ --- -libgit2 0.24.0 - Copied: girara/repos/community-i686/revert-incorrect-changes.patch (from rev 207369, girara/trunk/revert-incorrect-changes.patch) =================================================================== --- community-i686/revert-incorrect-changes.patch (rev 0) +++ community-i686/revert-incorrect-changes.patch 2017-01-14 17:52:46 UTC (rev 207370) @@ -0,0 +1,30 @@ +From 0b5406554e2304e012d975ee746e4ec27896701d Mon Sep 17 00:00:00 2001 +From: Sebastian Ramacher <sebastian+...@ramacher.at> +Date: Sat, 3 Sep 2016 12:00:49 +0200 +Subject: [PATCH] Revert unintended changes + +Signed-off-by: Sebastian Ramacher <sebastian+...@ramacher.at> +--- + data/girara-post-3.20.css_t | 6 ------ + 1 file changed, 0 insertions(+), 6 deletions(-) + +diff --git a/data/girara-post-3.20.css_t b/data/girara-post-3.20.css_t +index 29758de..1fdc4d2 100644 +--- a/data/girara-post-3.20.css_t ++++ b/data/girara-post-3.20.css_t +@@ -5,12 +5,6 @@ + font-family: @font-family@; + font-size: @font-size@; + font-weight: @font-weight@; +- box-shadow: none; +- border-style: none; +- margin: 0px; +- padding: @bottombox-padding1@px @bottombox-padding2@px @bottombox-padding3@px +- @bottombox-padding4@px; +- + } + + /* Scrollbar */ +-- +libgit2 0.24.0 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-01-14 17:51:49 UTC (rev 207369) +++ community-x86_64/PKGBUILD 2017-01-14 17:52:46 UTC (rev 207370) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: mlq <m...@pwmt.org> - -pkgname=girara -pkgver=0.2.7 -pkgrel=1 - -pkgdesc="User interface library focused on simplicity and minimalism" -url="http://pwmt.org/projects/girara" -arch=('i686' 'x86_64') -license=('custom') - -provides=('girara-gtk3' 'girara-common') -replaces=('girara-gtk3' 'girara-common') -conflicts=('girara-gtk3' 'girara-common') - -depends=('gtk3') - -source=(https://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) - -sha1sums=('d868a6fc55a155cc043e17e5da31b8440e7babf0') - -prepare() { - cd girara-$pkgver -} - -build() { - cd girara-$pkgver - touch colors.mk - make GIRARA_GTK_VERSION=3 -} - -package() { - cd girara-$pkgver - make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install - install -D -m664 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} Copied: girara/repos/community-x86_64/PKGBUILD (from rev 207369, girara/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-01-14 17:52:46 UTC (rev 207370) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: mlq <m...@pwmt.org> + +pkgname=girara +pkgver=0.2.7 +pkgrel=1 + +pkgdesc="User interface library focused on simplicity and minimalism" +url="http://pwmt.org/projects/girara" +arch=('i686' 'x86_64') +license=('custom') + +provides=('girara-gtk3' 'girara-common') +replaces=('girara-gtk3' 'girara-common') +conflicts=('girara-gtk3' 'girara-common') + +depends=('gtk3') + +source=(https://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) + +sha1sums=('d868a6fc55a155cc043e17e5da31b8440e7babf0') + +prepare() { + cd girara-$pkgver +} + +build() { + cd girara-$pkgver + touch colors.mk + make GIRARA_GTK_VERSION=3 +} + +package() { + cd girara-$pkgver + make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install + install -D -m664 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} Deleted: community-x86_64/fix-font-handling-gtk-3.21.patch =================================================================== --- community-x86_64/fix-font-handling-gtk-3.21.patch 2017-01-14 17:51:49 UTC (rev 207369) +++ community-x86_64/fix-font-handling-gtk-3.21.patch 2017-01-14 17:52:46 UTC (rev 207370) @@ -1,190 +0,0 @@ -From 949c879aa84e9496fabc7d3602060e29f9dc42a1 Mon Sep 17 00:00:00 2001 -From: Sebastian Ramacher <sebastian+...@ramacher.at> -Date: Sat, 3 Sep 2016 11:54:53 +0200 -Subject: [PATCH] Update font handling for changes in Gtk+ 3.21 - -Signed-off-by: Sebastian Ramacher <sebastian+...@ramacher.at> ---- - data/girara-post-3.20.css_t | 11 ++++++++++- - girara/config.c | 3 +-- - girara/internal.h | 2 ++ - girara/session.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- - 4 files changed, 103 insertions(+), 6 deletions(-) - -diff --git a/data/girara-post-3.20.css_t b/data/girara-post-3.20.css_t -index 491e08e..29758de 100644 ---- a/data/girara-post-3.20.css_t -+++ b/data/girara-post-3.20.css_t -@@ -2,7 +2,15 @@ - color: @default-fg@; - background-color: @default-bg@; - background-image: none; -- font: @font@; -+ font-family: @font-family@; -+ font-size: @font-size@; -+ font-weight: @font-weight@; -+ box-shadow: none; -+ border-style: none; -+ margin: 0px; -+ padding: @bottombox-padding1@px @bottombox-padding2@px @bottombox-padding3@px -+ @bottombox-padding4@px; -+ - } - - /* Scrollbar */ -@@ -114,4 +122,5 @@ - #@session@ scrolledwindow overshoot.right, - #@session@ scrolledwindow overshoot.right:backdrop { - background-color: transparent; -+ background-image: none; - } -diff --git a/girara/config.c b/girara/config.c -index 4e4092a..63127e8 100644 ---- a/girara/config.c -+++ b/girara/config.c -@@ -50,8 +50,7 @@ cb_font(girara_session_t* session, const char* UNUSED(name), - { - g_return_if_fail(session != NULL && value != NULL); - -- girara_template_set_variable_value(session->private_data->csstemplate, "font", -- value); -+ css_template_fill_font(session->private_data->csstemplate, value); - } - - static void -diff --git a/girara/internal.h b/girara/internal.h -index dac88b5..8e2d754 100644 ---- a/girara/internal.h -+++ b/girara/internal.h -@@ -148,6 +148,8 @@ HIDDEN bool girara_cmd_dump_config(girara_session_t* session, - HIDDEN bool girara_sc_feedkeys(girara_session_t* session, girara_argument_t* argument, - girara_event_t* event, unsigned int t); - -+HIDDEN void css_template_fill_font(GiraraTemplate* csstemplate, const char* font); -+ - /** - * Structure of a command - */ -diff --git a/girara/session.c b/girara/session.c -index b313f4d..2172fc7 100644 ---- a/girara/session.c -+++ b/girara/session.c -@@ -44,7 +44,6 @@ init_template_engine(GiraraTemplate* csstemplate) - { - static const char* variable_names[] = { - "session", -- "font", - "default-fg", - "default-bg", - "inputbar-fg", -@@ -78,6 +77,88 @@ init_template_engine(GiraraTemplate* csstemplate) - for (size_t idx = 0; idx < LENGTH(variable_names); ++idx) { - girara_template_add_variable(csstemplate, variable_names[idx]); - } -+ -+ if (gtk_check_version(3, 20, 0) == NULL) { -+ girara_template_add_variable(csstemplate, "font-family"); -+ girara_template_add_variable(csstemplate, "font-size"); -+ girara_template_add_variable(csstemplate, "font-weight"); -+ } else { -+ girara_template_add_variable(csstemplate, "font"); -+ } -+} -+ -+void -+css_template_fill_font(GiraraTemplate* csstemplate, const char* font) -+{ -+ if (gtk_check_version(3, 20, 0) != NULL) { -+ girara_template_set_variable_value(csstemplate, "font", font); -+ return; -+ } -+ -+ PangoFontDescription* descr = pango_font_description_from_string(font); -+ if (descr == NULL) { -+ return; -+ } -+ -+ girara_template_set_variable_value(csstemplate, "font-family", -+ pango_font_description_get_family(descr)); -+ -+ char* size = g_strdup_printf("%d%s", pango_font_description_get_size(descr) / PANGO_SCALE, -+ pango_font_description_get_size_is_absolute(descr) == FALSE ? "pt" : ""); -+ girara_template_set_variable_value(csstemplate, "font-size", size); -+ g_free(size); -+ -+ switch (pango_font_description_get_weight(descr)) { -+ case PANGO_WEIGHT_THIN: -+ girara_template_set_variable_value(csstemplate, "font-weight", "thin"); -+ break; -+ -+ case PANGO_WEIGHT_ULTRALIGHT: -+ girara_template_set_variable_value(csstemplate, "font-weight", "ultralight"); -+ break; -+ -+ case PANGO_WEIGHT_SEMILIGHT: -+ girara_template_set_variable_value(csstemplate, "font-weight", "light"); -+ break; -+ -+ case PANGO_WEIGHT_LIGHT: -+ girara_template_set_variable_value(csstemplate, "font-weight", "light"); -+ break; -+ -+ case PANGO_WEIGHT_BOOK: -+ girara_template_set_variable_value(csstemplate, "font-weight", "book"); -+ break; -+ -+ case PANGO_WEIGHT_MEDIUM: -+ girara_template_set_variable_value(csstemplate, "font-weight", "medium"); -+ break; -+ -+ case PANGO_WEIGHT_SEMIBOLD: -+ girara_template_set_variable_value(csstemplate, "font-weight", "semibold"); -+ break; -+ -+ case PANGO_WEIGHT_BOLD: -+ girara_template_set_variable_value(csstemplate, "font-weight", "bold"); -+ break; -+ -+ case PANGO_WEIGHT_ULTRABOLD: -+ girara_template_set_variable_value(csstemplate, "font-weight", "ultrabold"); -+ break; -+ -+ case PANGO_WEIGHT_HEAVY: -+ girara_template_set_variable_value(csstemplate, "font-weight", "heavy"); -+ break; -+ -+ case PANGO_WEIGHT_ULTRAHEAVY: -+ girara_template_set_variable_value(csstemplate, "font-weight", "ultraheavy"); -+ break; -+ -+ default: -+ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); -+ break; -+ } -+ -+ pango_font_description_free(descr); - } - - static void -@@ -91,10 +172,16 @@ fill_template_with_values(girara_session_t* session) - char* font = NULL; - girara_setting_get(session, "font", &font); - if (font != NULL) { -- girara_template_set_variable_value(csstemplate, "font", font); -+ css_template_fill_font(csstemplate, font); - g_free(font); - } else { -- girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); -+ if (gtk_check_version(3, 20, 0) == NULL) { -+ girara_template_set_variable_value(csstemplate, "font-family", "monospace"); -+ girara_template_set_variable_value(csstemplate, "font-size", "9pt"); -+ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); -+ } else { -+ girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); -+ } - }; - - /* parse color values */ --- -libgit2 0.24.0 - Copied: girara/repos/community-x86_64/fix-font-handling-gtk-3.21.patch (from rev 207369, girara/trunk/fix-font-handling-gtk-3.21.patch) =================================================================== --- community-x86_64/fix-font-handling-gtk-3.21.patch (rev 0) +++ community-x86_64/fix-font-handling-gtk-3.21.patch 2017-01-14 17:52:46 UTC (rev 207370) @@ -0,0 +1,190 @@ +From 949c879aa84e9496fabc7d3602060e29f9dc42a1 Mon Sep 17 00:00:00 2001 +From: Sebastian Ramacher <sebastian+...@ramacher.at> +Date: Sat, 3 Sep 2016 11:54:53 +0200 +Subject: [PATCH] Update font handling for changes in Gtk+ 3.21 + +Signed-off-by: Sebastian Ramacher <sebastian+...@ramacher.at> +--- + data/girara-post-3.20.css_t | 11 ++++++++++- + girara/config.c | 3 +-- + girara/internal.h | 2 ++ + girara/session.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 4 files changed, 103 insertions(+), 6 deletions(-) + +diff --git a/data/girara-post-3.20.css_t b/data/girara-post-3.20.css_t +index 491e08e..29758de 100644 +--- a/data/girara-post-3.20.css_t ++++ b/data/girara-post-3.20.css_t +@@ -2,7 +2,15 @@ + color: @default-fg@; + background-color: @default-bg@; + background-image: none; +- font: @font@; ++ font-family: @font-family@; ++ font-size: @font-size@; ++ font-weight: @font-weight@; ++ box-shadow: none; ++ border-style: none; ++ margin: 0px; ++ padding: @bottombox-padding1@px @bottombox-padding2@px @bottombox-padding3@px ++ @bottombox-padding4@px; ++ + } + + /* Scrollbar */ +@@ -114,4 +122,5 @@ + #@session@ scrolledwindow overshoot.right, + #@session@ scrolledwindow overshoot.right:backdrop { + background-color: transparent; ++ background-image: none; + } +diff --git a/girara/config.c b/girara/config.c +index 4e4092a..63127e8 100644 +--- a/girara/config.c ++++ b/girara/config.c +@@ -50,8 +50,7 @@ cb_font(girara_session_t* session, const char* UNUSED(name), + { + g_return_if_fail(session != NULL && value != NULL); + +- girara_template_set_variable_value(session->private_data->csstemplate, "font", +- value); ++ css_template_fill_font(session->private_data->csstemplate, value); + } + + static void +diff --git a/girara/internal.h b/girara/internal.h +index dac88b5..8e2d754 100644 +--- a/girara/internal.h ++++ b/girara/internal.h +@@ -148,6 +148,8 @@ HIDDEN bool girara_cmd_dump_config(girara_session_t* session, + HIDDEN bool girara_sc_feedkeys(girara_session_t* session, girara_argument_t* argument, + girara_event_t* event, unsigned int t); + ++HIDDEN void css_template_fill_font(GiraraTemplate* csstemplate, const char* font); ++ + /** + * Structure of a command + */ +diff --git a/girara/session.c b/girara/session.c +index b313f4d..2172fc7 100644 +--- a/girara/session.c ++++ b/girara/session.c +@@ -44,7 +44,6 @@ init_template_engine(GiraraTemplate* csstemplate) + { + static const char* variable_names[] = { + "session", +- "font", + "default-fg", + "default-bg", + "inputbar-fg", +@@ -78,6 +77,88 @@ init_template_engine(GiraraTemplate* csstemplate) + for (size_t idx = 0; idx < LENGTH(variable_names); ++idx) { + girara_template_add_variable(csstemplate, variable_names[idx]); + } ++ ++ if (gtk_check_version(3, 20, 0) == NULL) { ++ girara_template_add_variable(csstemplate, "font-family"); ++ girara_template_add_variable(csstemplate, "font-size"); ++ girara_template_add_variable(csstemplate, "font-weight"); ++ } else { ++ girara_template_add_variable(csstemplate, "font"); ++ } ++} ++ ++void ++css_template_fill_font(GiraraTemplate* csstemplate, const char* font) ++{ ++ if (gtk_check_version(3, 20, 0) != NULL) { ++ girara_template_set_variable_value(csstemplate, "font", font); ++ return; ++ } ++ ++ PangoFontDescription* descr = pango_font_description_from_string(font); ++ if (descr == NULL) { ++ return; ++ } ++ ++ girara_template_set_variable_value(csstemplate, "font-family", ++ pango_font_description_get_family(descr)); ++ ++ char* size = g_strdup_printf("%d%s", pango_font_description_get_size(descr) / PANGO_SCALE, ++ pango_font_description_get_size_is_absolute(descr) == FALSE ? "pt" : ""); ++ girara_template_set_variable_value(csstemplate, "font-size", size); ++ g_free(size); ++ ++ switch (pango_font_description_get_weight(descr)) { ++ case PANGO_WEIGHT_THIN: ++ girara_template_set_variable_value(csstemplate, "font-weight", "thin"); ++ break; ++ ++ case PANGO_WEIGHT_ULTRALIGHT: ++ girara_template_set_variable_value(csstemplate, "font-weight", "ultralight"); ++ break; ++ ++ case PANGO_WEIGHT_SEMILIGHT: ++ girara_template_set_variable_value(csstemplate, "font-weight", "light"); ++ break; ++ ++ case PANGO_WEIGHT_LIGHT: ++ girara_template_set_variable_value(csstemplate, "font-weight", "light"); ++ break; ++ ++ case PANGO_WEIGHT_BOOK: ++ girara_template_set_variable_value(csstemplate, "font-weight", "book"); ++ break; ++ ++ case PANGO_WEIGHT_MEDIUM: ++ girara_template_set_variable_value(csstemplate, "font-weight", "medium"); ++ break; ++ ++ case PANGO_WEIGHT_SEMIBOLD: ++ girara_template_set_variable_value(csstemplate, "font-weight", "semibold"); ++ break; ++ ++ case PANGO_WEIGHT_BOLD: ++ girara_template_set_variable_value(csstemplate, "font-weight", "bold"); ++ break; ++ ++ case PANGO_WEIGHT_ULTRABOLD: ++ girara_template_set_variable_value(csstemplate, "font-weight", "ultrabold"); ++ break; ++ ++ case PANGO_WEIGHT_HEAVY: ++ girara_template_set_variable_value(csstemplate, "font-weight", "heavy"); ++ break; ++ ++ case PANGO_WEIGHT_ULTRAHEAVY: ++ girara_template_set_variable_value(csstemplate, "font-weight", "ultraheavy"); ++ break; ++ ++ default: ++ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); ++ break; ++ } ++ ++ pango_font_description_free(descr); + } + + static void +@@ -91,10 +172,16 @@ fill_template_with_values(girara_session_t* session) + char* font = NULL; + girara_setting_get(session, "font", &font); + if (font != NULL) { +- girara_template_set_variable_value(csstemplate, "font", font); ++ css_template_fill_font(csstemplate, font); + g_free(font); + } else { +- girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); ++ if (gtk_check_version(3, 20, 0) == NULL) { ++ girara_template_set_variable_value(csstemplate, "font-family", "monospace"); ++ girara_template_set_variable_value(csstemplate, "font-size", "9pt"); ++ girara_template_set_variable_value(csstemplate, "font-weight", "normal"); ++ } else { ++ girara_template_set_variable_value(csstemplate, "font", "monospace normal 9"); ++ } + }; + + /* parse color values */ +-- +libgit2 0.24.0 + Deleted: community-x86_64/revert-incorrect-changes.patch =================================================================== --- community-x86_64/revert-incorrect-changes.patch 2017-01-14 17:51:49 UTC (rev 207369) +++ community-x86_64/revert-incorrect-changes.patch 2017-01-14 17:52:46 UTC (rev 207370) @@ -1,30 +0,0 @@ -From 0b5406554e2304e012d975ee746e4ec27896701d Mon Sep 17 00:00:00 2001 -From: Sebastian Ramacher <sebastian+...@ramacher.at> -Date: Sat, 3 Sep 2016 12:00:49 +0200 -Subject: [PATCH] Revert unintended changes - -Signed-off-by: Sebastian Ramacher <sebastian+...@ramacher.at> ---- - data/girara-post-3.20.css_t | 6 ------ - 1 file changed, 0 insertions(+), 6 deletions(-) - -diff --git a/data/girara-post-3.20.css_t b/data/girara-post-3.20.css_t -index 29758de..1fdc4d2 100644 ---- a/data/girara-post-3.20.css_t -+++ b/data/girara-post-3.20.css_t -@@ -5,12 +5,6 @@ - font-family: @font-family@; - font-size: @font-size@; - font-weight: @font-weight@; -- box-shadow: none; -- border-style: none; -- margin: 0px; -- padding: @bottombox-padding1@px @bottombox-padding2@px @bottombox-padding3@px -- @bottombox-padding4@px; -- - } - - /* Scrollbar */ --- -libgit2 0.24.0 - Copied: girara/repos/community-x86_64/revert-incorrect-changes.patch (from rev 207369, girara/trunk/revert-incorrect-changes.patch) =================================================================== --- community-x86_64/revert-incorrect-changes.patch (rev 0) +++ community-x86_64/revert-incorrect-changes.patch 2017-01-14 17:52:46 UTC (rev 207370) @@ -0,0 +1,30 @@ +From 0b5406554e2304e012d975ee746e4ec27896701d Mon Sep 17 00:00:00 2001 +From: Sebastian Ramacher <sebastian+...@ramacher.at> +Date: Sat, 3 Sep 2016 12:00:49 +0200 +Subject: [PATCH] Revert unintended changes + +Signed-off-by: Sebastian Ramacher <sebastian+...@ramacher.at> +--- + data/girara-post-3.20.css_t | 6 ------ + 1 file changed, 0 insertions(+), 6 deletions(-) + +diff --git a/data/girara-post-3.20.css_t b/data/girara-post-3.20.css_t +index 29758de..1fdc4d2 100644 +--- a/data/girara-post-3.20.css_t ++++ b/data/girara-post-3.20.css_t +@@ -5,12 +5,6 @@ + font-family: @font-family@; + font-size: @font-size@; + font-weight: @font-weight@; +- box-shadow: none; +- border-style: none; +- margin: 0px; +- padding: @bottombox-padding1@px @bottombox-padding2@px @bottombox-padding3@px +- @bottombox-padding4@px; +- + } + + /* Scrollbar */ +-- +libgit2 0.24.0 +