* Re: [PR PATCH] [Updated] giggle: Fix cross build
2020-12-14 16:36 [PR PATCH] giggle: Fix cross build ndowens
@ 2020-12-14 16:36 ` ndowens
2020-12-15 8:57 ` sgn
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ndowens @ 2020-12-14 16:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages giggle
https://github.com/void-linux/void-packages/pull/27151
giggle: Fix cross build
A patch file from https://github.com/void-linux/void-packages/pull/27151.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-giggle-27151.patch --]
[-- Type: text/x-diff, Size: 2422 bytes --]
From c9ae4cae140bee7af7847967ce545eb3ddd1b256 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 14 Dec 2020 10:36:26 -0600
Subject: [PATCH] giggle: Fix cross build
---
srcpkgs/giggle/patches/0001-Fix-cross.patch | 34 +++++++++++++++++++++
srcpkgs/giggle/template | 1 -
2 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/giggle/patches/0001-Fix-cross.patch
diff --git a/srcpkgs/giggle/patches/0001-Fix-cross.patch b/srcpkgs/giggle/patches/0001-Fix-cross.patch
new file mode 100644
index 00000000000..9589fdc0ac1
--- /dev/null
+++ b/srcpkgs/giggle/patches/0001-Fix-cross.patch
@@ -0,0 +1,34 @@
+From a3f22386938bd54214011b2b711b55b5fa277698 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Mon, 14 Dec 2020 10:18:27 -0600
+Subject: [PATCH] Fix cross
+
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git configure configure
+index 3faf65b..ddbdb2f 100755
+--- configure
++++ configure
+@@ -13359,7 +13359,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU extensions of strptime()" >&5
+ $as_echo_n "checking for GNU extensions of strptime()... " >&6; }
+-if test "$cross_compiling" = yes; then :
++if test "$cross_compiling" = xyes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run test program while cross compiling
+@@ -13395,7 +13395,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t type" >&5
+ $as_echo_n "checking size of time_t type... " >&6; }
+-if test "$cross_compiling" = yes; then :
++if test "$cross_compiling" = xyes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run test program while cross compiling
+--
+2.29.2
+
diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 9da11473757..2e42bcb849f 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -13,7 +13,6 @@ homepage="https://wiki.gnome.org/Apps/giggle"
distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
checksum=ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59
lib32disabled=yes
-nocross=yes
CFLAGS="-fcommon"
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: giggle: Fix cross build
2020-12-14 16:36 [PR PATCH] giggle: Fix cross build ndowens
2020-12-14 16:36 ` [PR PATCH] [Updated] " ndowens
2020-12-15 8:57 ` sgn
@ 2020-12-15 10:03 ` sgn
2020-12-18 0:27 ` sgn
2020-12-18 0:27 ` [PR PATCH] [Closed]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-12-15 10:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3830 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/27151#issuecomment-745184523
Comment:
Anyway, `giggle` crashed in all of my machine :-p. So, you can try this patch and tell, I don't have time for now.
```diff
srcpkgs/giggle/patches/cross.patch | 61 ++++++++++++++++++++++++++++++++++++++
srcpkgs/giggle/template | 12 ++++++--
2 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/giggle/patches/cross.patch b/srcpkgs/giggle/patches/cross.patch
new file mode 100644
index 0000000000..889d750289
--- /dev/null
+++ b/srcpkgs/giggle/patches/cross.patch
@@ -0,0 +1,61 @@
+diff --git configure.ac configure.ac
+index a7011f8..1ab7a52 100644
+--- configure.ac
++++ configure.ac
+@@ -125,30 +125,6 @@ dnl ----------------------
+
+ AC_DEFINE(_GNU_SOURCE, 1, [Enable GNU Extensions])
+
+-dnl Make sure that strptime can be used (read: has gnu extensions)
+-AC_MSG_CHECKING([for GNU extensions of strptime()])
+-AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <time.h>]],
+- [[const char* date = "1168635922 +0100"; struct tm tm;
+- char const* returned = strptime(date, "%s %z", &tm);
+- return (!returned || *returned ? 1 : 0);]])],
+- [AC_MSG_RESULT(available)
+- AC_DEFINE([STRPTIME_HAS_GNU], [1],
+- [strptime() has GNU extensions %s and %z])],
+- [AC_MSG_RESULT(not available)])
+-
+-dnl Figure out which format string to use for time_t
+-AC_MSG_CHECKING([size of time_t type])
+-AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <time.h>]],
+- [[return (sizeof (time_t) == sizeof (long) ? 0 : 1);]])],
+- [AC_MSG_RESULT(long)
+- AC_DEFINE([GIGGLE_FORMAT_TIME_T], ["ld"], [format string for time_t])],
+- [AC_MSG_RESULT(int)
+- AC_DEFINE([GIGGLE_FORMAT_TIME_T], ["d"], [format string for time_t])])
+-
+ dnl ------------------
+ dnl | Language Support |---------------------------------------
+ dnl ------------------
+diff --git libgiggle-git/giggle-git-revisions.c libgiggle-git/giggle-git-revisions.c
+index d074d5c..692781d 100644
+--- libgiggle-git/giggle-git-revisions.c
++++ libgiggle-git/giggle-git-revisions.c
+@@ -130,7 +130,7 @@ git_revisions_get_command_line (GiggleJob *job,
+ static struct tm *
+ git_revisions_get_time (const gchar *date)
+ {
+-#if STRPTIME_HAS_GNU
++#ifdef __GLIBC__
+ const gchar *returned;
+ struct tm *tm;
+
+@@ -145,9 +145,11 @@ git_revisions_get_time (const gchar *date)
+ return tm;
+ #else
+ struct tm *tm = g_new0 (struct tm, 1);
++ long ltime;
+ time_t time;
+
+- sscanf (date, "%" GIGGLE_FORMAT_TIME_T, &time);
++ sscanf (date, "%ld", <ime);
++ time = ltime;
+ localtime_r (&time, tm);
+
+ return tm;
diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 9da1147375..1984fed3f6 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -1,9 +1,10 @@
# Template file for 'giggle'
pkgname=giggle
version=0.7
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config itstool intltool glib-devel git"
+hostmakedepends="pkg-config itstool intltool glib-devel git
+ automake gettext-devel libtool tar yelp-tools"
makedepends="gtksourceview-devel vte290-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Git repository viewer"
@@ -13,10 +14,15 @@ homepage="https://wiki.gnome.org/Apps/giggle"
distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
checksum=ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59
lib32disabled=yes
-nocross=yes
CFLAGS="-fcommon"
+pre_configure() {
+ autoreconf -fi
+ intltoolize --force
+ autoreconf
+}
+
libgiggle_package() {
short_desc+=" - runtime libraries"
pkg_install() {
```
^ permalink raw reply [flat|nested] 6+ messages in thread