[arch-commits] Commit in girara/trunk (4 files)
Johannes Löthberg
demize at archlinux.org
Sat Mar 24 12:25:20 UTC 2018
Date: Saturday, March 24, 2018 @ 12:25:19
Author: demize
Revision: 311873
upgpkg: girara 0.2.9-1
Modified:
girara/trunk/PKGBUILD
Deleted:
girara/trunk/fix-font-handling-gtk-3.21.patch
girara/trunk/remove-tabs.h-include.patch
girara/trunk/revert-incorrect-changes.patch
----------------------------------+
PKGBUILD | 29 ++---
fix-font-handling-gtk-3.21.patch | 190 -------------------------------------
remove-tabs.h-include.patch | 25 ----
revert-incorrect-changes.patch | 30 -----
4 files changed, 13 insertions(+), 261 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-24 12:18:55 UTC (rev 311872)
+++ PKGBUILD 2018-03-24 12:25:19 UTC (rev 311873)
@@ -5,8 +5,8 @@
# Contributor: mlq <mlq at pwmt.org>
pkgname=girara
-pkgver=0.2.8
-pkgrel=3
+pkgver=0.2.9
+pkgrel=1
pkgdesc="User interface library focused on simplicity and minimalism"
url="http://pwmt.org/projects/girara"
@@ -18,26 +18,23 @@
conflicts=('girara-gtk3' 'girara-common')
depends=('gtk3')
+makedepends=('meson' 'ninja')
-source=(https://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz
- remove-tabs.h-include.patch)
+source=(https://pwmt.org/projects/girara/download/girara-$pkgver.tar.xz)
-sha1sums=('fa7fddfb5fe2592252ca7253b69be4eb0706438a'
- '5ca177290cb5e436c70bb8728afbf3b6e3518d58')
+sha1sums=('69d20c2f06c47ef51feb34148ef8c4985b9e8a77')
-prepare() {
+build() {
cd girara-$pkgver
- patch -p1 <"$srcdir"/remove-tabs.h-include.patch
-}
+ arch-meson build
-build() {
- cd girara-$pkgver
- touch colors.mk
- make GIRARA_GTK_VERSION=3
+ cd build
+ ninja
}
package() {
- cd girara-$pkgver
- make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install
- install -D -m664 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ cd girara-$pkgver/build
+ DESTDIR="$pkgdir/" ninja install
+
+ install -D -m664 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
Deleted: fix-font-handling-gtk-3.21.patch
===================================================================
--- fix-font-handling-gtk-3.21.patch 2018-03-24 12:18:55 UTC (rev 311872)
+++ fix-font-handling-gtk-3.21.patch 2018-03-24 12:25:19 UTC (rev 311873)
@@ -1,190 +0,0 @@
-From 949c879aa84e9496fabc7d3602060e29f9dc42a1 Mon Sep 17 00:00:00 2001
-From: Sebastian Ramacher <sebastian+dev at 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+dev at 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 at px @bottombox-padding2 at px @bottombox-padding3 at px
-+ @bottombox-padding4 at 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: remove-tabs.h-include.patch
===================================================================
--- remove-tabs.h-include.patch 2018-03-24 12:18:55 UTC (rev 311872)
+++ remove-tabs.h-include.patch 2018-03-24 12:25:19 UTC (rev 311873)
@@ -1,25 +0,0 @@
-From e8d13a18165344ea62c94bed8d5ccb97e6b51a43 Mon Sep 17 00:00:00 2001
-From: Johannes Löthberg <johannes at kyriasis.com>
-Date: Sat, 6 Jan 2018 21:11:20 +0000
-Subject: [PATCH] girara.h: Remove include of config.h
-
-1ed60c98d961df9b8949b62c3061f93a81f51a42 deleted it, but forgot to remove the include.
----
- girara/girara.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/girara/girara.h b/girara/girara.h
-index 523438d..7fd5bf0 100644
---- a/girara/girara.h
-+++ b/girara/girara.h
-@@ -9,7 +9,6 @@
- #include "datastructures.h"
- #include "settings.h"
- #include "completion.h"
--#include "tabs.h"
- #include "config.h"
- #include "statusbar.h"
- #include "shortcuts.h"
---
-libgit2 0.26.0
-
Deleted: revert-incorrect-changes.patch
===================================================================
--- revert-incorrect-changes.patch 2018-03-24 12:18:55 UTC (rev 311872)
+++ revert-incorrect-changes.patch 2018-03-24 12:25:19 UTC (rev 311873)
@@ -1,30 +0,0 @@
-From 0b5406554e2304e012d975ee746e4ec27896701d Mon Sep 17 00:00:00 2001
-From: Sebastian Ramacher <sebastian+dev at ramacher.at>
-Date: Sat, 3 Sep 2016 12:00:49 +0200
-Subject: [PATCH] Revert unintended changes
-
-Signed-off-by: Sebastian Ramacher <sebastian+dev at 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 at px @bottombox-padding2 at px @bottombox-padding3 at px
-- @bottombox-padding4 at px;
--
- }
-
- /* Scrollbar */
---
-libgit2 0.24.0
-
More information about the arch-commits
mailing list