[poppler] 4 commits - cmake/modules .gitlab-ci.yml glib/demo

[GitLab Mirror]

 .gitlab-ci.yml              |    8 ++++----
 cmake/modules/FindGTK.cmake |    9 +++------
 glib/demo/utils.c           |   17 ++++++++---------
 3 files changed, 15 insertions(+), 19 deletions(-)

New commits:
commit 22dd47a64222bf967d57b986539ae1be46bc06a7
Author: Elliott Sales de Andrade <quantum.analyst at gmail.com>
Date:   Sun Oct 21 18:48:40 2018 -0400

    Use GDateTime to format dates in GLib demo.
    
    Removing localtime_r allows the demo to be built on Windows.

diff --git a/glib/demo/utils.c b/glib/demo/utils.c
index aa6cd761..21b9788b 100644
--- a/glib/demo/utils.c
+++ b/glib/demo/utils.c
@@ -488,17 +488,16 @@ pgd_action_view_set_action (GtkWidget     *action_view,
 gchar *
 pgd_format_date (time_t utime)
 {
-	time_t time = (time_t) utime;
-	char s[256];
-	const char *fmt_hack = "%c";
-	size_t len;
-	struct tm t;
-	if (time == 0 || !localtime_r (&time, &t)) return NULL;
-	len = strftime (s, sizeof (s), fmt_hack, &t);
+	GDateTime *dt = NULL;
+	gchar *s = NULL;
 
-	if (len == 0 || s[0] == '\0') return NULL;
+	if (utime == 0) return NULL;
+	dt = g_date_time_new_from_unix_local (utime);
+	if (dt == NULL) return NULL;
+	s = g_date_time_format (dt, "%c");
+	g_date_time_unref (dt);
 
-	return g_locale_to_utf8 (s, -1, NULL, NULL, NULL);
+	return s;
 }
 
 GtkWidget *
commit 2125bfa4b754088fd9f753aea70ec08ea14dd4bc
Author: Elliott Sales de Andrade <quantum.analyst at gmail.com>
Date:   Sun Oct 21 18:20:18 2018 -0400

    Remove SYSTEM flag from another file for mingw build.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1620625..611af34c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,7 +66,7 @@ build_mingw64_fedora:
     - dnf builddep -y mingw64-poppler
     - dnf -y install mingw64-curl make ninja-build mingw64-openjpeg2-tools mingw32-openjpeg2-tools
   script:
-    - sed -i '/SYSTEM/d' glib/CMakeLists.txt
+    - sed -i '/SYSTEM/d' glib/CMakeLists.txt test/CMakeLists.txt
     - mkdir -p build && cd build
     - mingw64-cmake -G Ninja ..
     - ninja
commit 497498f02c2b26aa7cfa8f9bc881b305b13796d8
Author: Elliott Sales de Andrade <quantum.analyst at gmail.com>
Date:   Sun Oct 21 17:55:12 2018 -0400

    Use dnf on Fedora instead of yum.
    
    dnf replaced yum a few releases ago.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89d0c2ab..f1620625 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,9 +62,9 @@ build_mingw64_fedora:
   stage: build
   image: fedora
   before_script:
-    - yum -y install yum-utils
-    - yum-builddep -y mingw64-poppler
-    - yum -y install mingw64-curl make ninja-build mingw64-openjpeg2-tools mingw32-openjpeg2-tools
+    - dnf install -y 'dnf-command(builddep)'
+    - dnf builddep -y mingw64-poppler
+    - dnf -y install mingw64-curl make ninja-build mingw64-openjpeg2-tools mingw32-openjpeg2-tools
   script:
     - sed -i '/SYSTEM/d' glib/CMakeLists.txt
     - mkdir -p build && cd build
commit 5b1faed4a8b4a749d06fc192770bb38e98631972
Author: Elliott Sales de Andrade <quantum.analyst at gmail.com>
Date:   Sun Oct 21 17:47:38 2018 -0400

    Enable searching for GTK on Windows.
    
    There's no reason it can't be available (either natively, or when
    cross-compiling with mingw).

diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake
index 4b9e23e2..86af910c 100644
--- a/cmake/modules/FindGTK.cmake
+++ b/cmake/modules/FindGTK.cmake
@@ -12,11 +12,8 @@
 
 include(FindPackageHandleStandardArgs)
 
-if (NOT WIN32)
-  find_package(PkgConfig REQUIRED)
+find_package(PkgConfig REQUIRED)
 
-  pkg_check_modules(GTK3 "gtk+-3.0>=3.8" "gdk-pixbuf-2.0>=2.8")
+pkg_check_modules(GTK3 "gtk+-3.0>=3.8" "gdk-pixbuf-2.0>=2.8")
 
-  find_package_handle_standard_args(GTK DEFAULT_MSG GTK3_LIBRARIES GTK3_CFLAGS)
-
-endif(NOT WIN32)
+find_package_handle_standard_args(GTK DEFAULT_MSG GTK3_LIBRARIES GTK3_CFLAGS)