mirror of
https://github.com/moparisthebest/arch-ppa
synced 2024-11-21 00:05:00 -05:00
Fix biboumi, update deps of qemu-user-static
This commit is contained in:
parent
1b96358c5f
commit
3baefde685
@ -8,7 +8,7 @@ arch=('x86_64' 'armv7h' 'aarch64')
|
||||
url="https://biboumi.louiz.org/"
|
||||
license=('ZLIB')
|
||||
depends=('expat' 'libidn' 'udns' 'botan' 'sqlite' 'postgresql-libs')
|
||||
makedepends=('cmake' 'ninja' 'python-sphinx' 'python-sphinx_rtd_theme')
|
||||
makedepends=('cmake' 'ninja' 'python-sphinx' 'python-sphinx_rtd_theme' 'git')
|
||||
backup=("etc/$pkgname/$pkgname.cfg")
|
||||
source=("https://git.louiz.org/biboumi/snapshot/$pkgname-$pkgver.tar.xz"
|
||||
'biboumi.tmpfiles'
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
pkgname=chocolate-doom-git
|
||||
pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports."
|
||||
pkgver=3.0.0.r822.ee9fc21f
|
||||
pkgrel=2
|
||||
pkgver=3.0.0.r979.df1837c1
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.chocolate-doom.org/"
|
||||
license=('GPL2')
|
||||
|
||||
102
src/glib2-static/1683.patch
Normal file
102
src/glib2-static/1683.patch
Normal file
@ -0,0 +1,102 @@
|
||||
From b411f518b8dc7a99bad52884048436d991c89b77 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 5 Oct 2020 17:07:29 +0000
|
||||
Subject: [PATCH 1/2] Add a test for the 6-days-until-EOM bug
|
||||
|
||||
---
|
||||
glib/tests/gdatetime.c | 26 ++++++++++++++++++++++++++
|
||||
1 file changed, 26 insertions(+)
|
||||
|
||||
diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
|
||||
index 52eec1e46..0731f01f2 100644
|
||||
--- a/glib/tests/gdatetime.c
|
||||
+++ b/glib/tests/gdatetime.c
|
||||
@@ -2192,6 +2192,31 @@ test_z (void)
|
||||
g_time_zone_unref (tz);
|
||||
}
|
||||
|
||||
+static void
|
||||
+test_6_days_util_end_of_the_month (void)
|
||||
+{
|
||||
+ GTimeZone *tz;
|
||||
+ GDateTime *dt;
|
||||
+ gchar *p;
|
||||
+
|
||||
+ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2215");
|
||||
+
|
||||
+#ifdef G_OS_UNIX
|
||||
+ tz = g_time_zone_new ("Europe/Paris");
|
||||
+#elif defined (G_OS_WIN32)
|
||||
+ tz = g_time_zone_new ("Romance Standard Time");
|
||||
+#endif
|
||||
+ dt = g_date_time_new (tz, 2020, 10, 5, 1, 1, 1);
|
||||
+
|
||||
+ p = g_date_time_format (dt, "%Y-%m-%d %H:%M:%S%z");
|
||||
+ /* Incorrect output is "2020-10-05 01:01:01+0100" */
|
||||
+ g_assert_cmpstr (p, ==, "2020-10-05 01:01:01+0200");
|
||||
+ g_free (p);
|
||||
+
|
||||
+ g_date_time_unref (dt);
|
||||
+ g_time_zone_unref (tz);
|
||||
+}
|
||||
+
|
||||
static void
|
||||
test_format_iso8601 (void)
|
||||
{
|
||||
@@ -2785,6 +2810,7 @@ main (gint argc,
|
||||
g_test_add_func ("/GDateTime/new_from_iso8601/2", test_GDateTime_new_from_iso8601_2);
|
||||
g_test_add_func ("/GDateTime/new_full", test_GDateTime_new_full);
|
||||
g_test_add_func ("/GDateTime/now", test_GDateTime_now);
|
||||
+ g_test_add_func ("/GDateTime/test-6-days-util-end-of-the-month", test_6_days_util_end_of_the_month);
|
||||
g_test_add_func ("/GDateTime/printf", test_GDateTime_printf);
|
||||
g_test_add_func ("/GDateTime/non_utf8_printf", test_non_utf8_printf);
|
||||
g_test_add_func ("/GDateTime/format_unrepresentable", test_format_unrepresentable);
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 4a120c2e2e0a26e1cd5ce7cb4ebe906ef6d588d3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 5 Oct 2020 16:53:47 +0000
|
||||
Subject: [PATCH 2/2] Fix the 6-days-until-the-end-of-the-month bug
|
||||
|
||||
The addition causes the date to shift
|
||||
forward into 1st of the next month, because a 0-based offset
|
||||
is compared to be "more than" the days in the month instead of "more than
|
||||
or equal to".
|
||||
|
||||
This is triggered by corner-cases where transition date is 6 days
|
||||
off the end of the month and our calculations put it at N+1th day of the
|
||||
month (where N is the number of days in the month). The subtraction should
|
||||
be triggered to move the date back a week, putting it 6 days off the end;
|
||||
for example, October 25 for CET DST transition; but due to incorrect comparison
|
||||
the date isn't shifted back, we add 31 days to October 1st and end up
|
||||
at November 1st).
|
||||
|
||||
Fixes issue #2215.
|
||||
---
|
||||
glib/gtimezone.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
|
||||
index ef67ec50b..0de5c92a3 100644
|
||||
--- a/glib/gtimezone.c
|
||||
+++ b/glib/gtimezone.c
|
||||
@@ -1041,7 +1041,11 @@ find_relative_date (TimeZoneDate *buffer)
|
||||
/* week is 1 <= w <= 5, we need 0-based */
|
||||
days = 7 * (buffer->week - 1) + wday - first_wday;
|
||||
|
||||
- while (days > days_in_month)
|
||||
+ /* "days" is a 0-based offset from the 1st of the month.
|
||||
+ * Adding days == days_in_month would bring us into the next month,
|
||||
+ * hence the ">=" instead of just ">".
|
||||
+ */
|
||||
+ while (days >= days_in_month)
|
||||
days -= 7;
|
||||
|
||||
g_date_add_days (&date, days);
|
||||
--
|
||||
GitLab
|
||||
|
||||
47
src/glib2-static/PKGBUILD
Normal file
47
src/glib2-static/PKGBUILD
Normal file
@ -0,0 +1,47 @@
|
||||
# Maintainer: nightuser <nightuser.android@gmail.com>
|
||||
|
||||
pkgname=glib2-static
|
||||
pkgver=2.66.1
|
||||
pkgrel=1
|
||||
pkgdesc="Low level core library: Static library"
|
||||
url="https://wiki.gnome.org/Projects/GLib"
|
||||
license=(LGPL2.1)
|
||||
arch=(x86_64)
|
||||
depends=()
|
||||
makedepends=(gettext zlib libffi shared-mime-info python libelf git util-linux meson dbus)
|
||||
checkdepends=(desktop-file-utils)
|
||||
options=('!docs' '!libtool' '!emptydirs' '!strip' 'staticlibs')
|
||||
source=("http://ftp.gnome.org/pub/gnome/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz"
|
||||
'1683.patch')
|
||||
sha256sums=('a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60'
|
||||
'e1913090c7cdd4c7db12651858a8381be28ae61f19d5e5e02a33f4c7c74c926d')
|
||||
|
||||
prepare() {
|
||||
cd "glib-$pkgver"
|
||||
patch -Np1 -i "$srcdir/1683.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
CFLAGS+=' -Wno-unused-result'
|
||||
arch-meson "glib-$pkgver" _build \
|
||||
--default-library static \
|
||||
--buildtype release \
|
||||
-Dselinux=disabled \
|
||||
-Dman=false \
|
||||
-Dgtk_doc=false \
|
||||
-Dinternal_pcre=false
|
||||
ninja -C _build
|
||||
}
|
||||
|
||||
check() {
|
||||
meson test -C _build --no-suite flaky --timeout-multiplier 2 --print-errorlogs
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" meson install -C _build
|
||||
|
||||
# Only install static library
|
||||
rm -rf "$pkgdir"/usr/{bin,include,share,lib/glib-2.0,lib/pkgconfig}
|
||||
}
|
||||
|
||||
# vim: et:sw=2:ts=8
|
||||
35
src/pcre-static/PKGBUILD
Normal file
35
src/pcre-static/PKGBUILD
Normal file
@ -0,0 +1,35 @@
|
||||
# Maintainer: ajs124 < aur AT ajs124 DOT de >
|
||||
# Contributor: Allan McRae <allan@archlinux.org>
|
||||
# Contributor: Eric Belanger <eric@archlinux.org>
|
||||
# Contributor: John Proctor <jproctor@prium.net>
|
||||
|
||||
pkgname=pcre-static
|
||||
pkgver=8.44
|
||||
pkgrel=4
|
||||
pkgdesc="A library that implements Perl 5-style regular expressions"
|
||||
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
|
||||
url="http://www.pcre.org/"
|
||||
license=('BSD')
|
||||
depends=('gcc-libs')
|
||||
options=('staticlibs' '!libtool')
|
||||
validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8')
|
||||
#source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pkgver}.tar.bz2{,.sig})
|
||||
source=(https://ftp.pcre.org/pub/pcre/pcre-${pkgver}.tar.bz2)
|
||||
sha256sums=('19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}"/pcre-${pkgver}
|
||||
./configure --prefix=/usr \
|
||||
--enable-pcre16 --enable-pcre32 --enable-jit \
|
||||
--enable-utf --enable-unicode-properties
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}"/pcre-${pkgver}
|
||||
make DESTDIR="${pkgdir}" install
|
||||
rm -rf $pkgdir/usr/{bin,include,share,lib/pkgconfig}
|
||||
rm -f $pkgdir/usr/lib/*.so*
|
||||
|
||||
install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
# Maintainer: moparisthebest <admin dot archlinux AT moparisthebest dot com>
|
||||
|
||||
pkgname=rusty-keys-git
|
||||
pkgver=0.0.2.r18.g0ffc169
|
||||
pkgver=0.0.3.win.beta.r7.g965c446
|
||||
pkgrel=1
|
||||
pkgdesc="uinput level keyboard mapper for linux"
|
||||
url="https://code.moparisthebest.com/moparisthebest/rusty-keys"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user