Win32Depends.cmake: get rid of 7z

CMake 3.9 has been proven to successfully unpack 7z archives.
Bump the CMake version requirement, fix Windows
2021-10-22 21:53:35 +02:00 · 2021-10-22 20:08:51 +02:00 · 2021-10-22 14:41:37 +02:00 · 2021-10-22 01:40:29 +02:00 · 2021-10-21 21:53:20 +02:00 · 2021-10-21 21:37:44 +02:00
61 changed files with 245 additions and 277 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,6 @@
-project (logdiag C)
-cmake_minimum_required (VERSION 2.8)
-
-# Default to 2.8 behaviour
-cmake_policy (VERSION 2.8)
+# The last version with Windows XP support is 3.13, we want to keep that
+cmake_minimum_required (VERSION 3.9)
+project (logdiag VERSION 0.2.0 LANGUAGES C)

 # Options
 option (OPTION_USE_VERA "Use vera++ for source code style checks" OFF)
@@ -10,14 +8,6 @@ option (OPTION_NOINSTALL "Only for developers; work without installing" OFF)
 option (BUILD_TESTING "Build tests" OFF)

 # Project information
-set (project_VERSION_MAJOR "0")
-set (project_VERSION_MINOR "2")
-set (project_VERSION_PATCH "0")
-
-set (project_VERSION "${project_VERSION_MAJOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_MINOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}")
-
 set (project_URL "https://git.janouch.name/p/logdiag")

 # For custom modules
@@ -28,7 +18,7 @@ if (WIN32)
 	set (WIN32_DEPENDS_PATH ${PROJECT_SOURCE_DIR}/win32-depends)
 	list (APPEND CMAKE_PREFIX_PATH ${WIN32_DEPENDS_PATH})
 	list (APPEND CMAKE_INCLUDE_PATH ${WIN32_DEPENDS_PATH}/lib)
-	list (APPEND CMAKE_C_FLAGS "-mms-bitfields")
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields")

 	if (CMAKE_CROSSCOMPILING)
 		list (APPEND CMAKE_FIND_ROOT_PATH ${WIN32_DEPENDS_PATH})
@@ -90,7 +80,6 @@ else (NOT WIN32)
 	# For whatever reason this now seems to be required
 	set (LUA_INCLUDE_DIR "${WIN32_DEPENDS_PATH}/include")

-	# XXX: this seems to require CMake 3.0 ... include it in the project?
 	find_package (Lua REQUIRED)
 	if (LUA_VERSION_STRING VERSION_LESS "5.2")
 		message (FATAL_ERROR "Lua 5.2 not found")
@@ -114,7 +103,7 @@ foreach (file ${project_PO_FILES})
 	list (APPEND project_TRANSLATIONS "${translation}")
 endforeach (file)

-# Documentation
+# Documentation--gtk-doc 1.25 is required
 find_package (GtkDoc 1.25)
 set (project_DOC_DIR "${PROJECT_BINARY_DIR}/liblogdiag")

@@ -250,9 +239,13 @@ if (BUILD_TESTING)
 	foreach (name ${logdiag_TESTS})
 		add_executable (test-${name} tests/${name}.c)
 		target_link_libraries (test-${name} liblogdiag ${logdiag_LIBS})
-
-		add_test (test-${name} test-${name})
+		add_test (NAME test-${name} COMMAND test-${name})
+		list (APPEND logdiag_TEST_TARGETS test-${name})
 	endforeach (name)
+	if (WIN32 AND NOT CMAKE_CROSSCOMPILING)
+		set_tests_properties (${logdiag_TEST_TARGETS}
+			PROPERTIES ENVIRONMENT "PATH=${WIN32_DEPENDS_PATH}/bin")
+	endif ()
 endif (BUILD_TESTING)

 # Generate documentation
@@ -347,12 +340,16 @@ if (WIN32)
 		DESTINATION etc)
 	install (DIRECTORY
 		${WIN32_DEPENDS_PATH}/lib/gdk-pixbuf-2.0
-		DESTINATION lib)
+		DESTINATION lib
+		FILES_MATCHING PATTERN "*" PATTERN "*.a" EXCLUDE)
 	install (DIRECTORY
 		${WIN32_DEPENDS_PATH}/share/glib-2.0/schemas
 		DESTINATION share/glib-2.0
 		FILES_MATCHING PATTERN "org.gtk.Settings.*")

+	install (DIRECTORY
+		${WIN32_DEPENDS_PATH}/share/icons/Adwaita
+		DESTINATION share/icons OPTIONAL)
 	install (FILES
 		${WIN32_DEPENDS_PATH}/share/icons/hicolor/index.theme
 		DESTINATION share/icons/hicolor)
@@ -380,25 +377,20 @@ else (WIN32)
 	install (FILES LICENSE NEWS DESTINATION share/doc/${PROJECT_NAME})
 endif (WIN32)

-install (FILES ${GSETTINGS_SCHEMAS}
-	DESTINATION share/glib-2.0/schemas)
+install (DIRECTORY share/gui share/library DESTINATION share/${PROJECT_NAME})
+install (FILES ${GSETTINGS_SCHEMAS} DESTINATION share/glib-2.0/schemas)
 install (CODE " # DESTDIR is not in use on Windows
 	if (WIN32 OR \"\$ENV{DESTDIR}\" STREQUAL \"\")
-		execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS_EXECUTABLE}
+		execute_process (COMMAND \"${GLIB_COMPILE_SCHEMAS_EXECUTABLE}\"
 			\"\${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas\")
 	endif (WIN32 OR \"\$ENV{DESTDIR}\" STREQUAL \"\")")

-install (DIRECTORY share/gui share/library
-	DESTINATION share/${PROJECT_NAME})
-
 # CPack
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Schematic editor")
-set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
-set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
+set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
+set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR})
-set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR})
-set (CPACK_PACKAGE_VERSION_PATCH ${project_VERSION_PATCH})
+set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION})

 if (WIN32)
 	set (CPACK_GENERATOR "NSIS;ZIP")
@@ -408,11 +400,13 @@ else (WIN32)
 endif (WIN32)

 set (CPACK_PACKAGE_FILE_NAME
-	"${PROJECT_NAME}-${project_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
-set (CPACK_PACKAGE_INSTALL_DIRECTORY
-	"${PROJECT_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+	"${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME} ${CPACK_PACKAGE_VERSION}")
+
+# XXX: It is still possible to install multiple copies, making commands collide.
+set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${PROJECT_NAME}")

-# FIXME: It is possible to install multiple copies. Everything screws up then.
 set (CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/share\\\\header.bmp")
 set (CPACK_NSIS_INSTALLED_ICON_NAME "logdiag.exe")
 set (CPACK_NSIS_CREATE_ICONS_EXTRA "
@@ -446,7 +440,7 @@ set (CPACK_RPM_PACKAGE_URL "${project_URL}")

 set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
 set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git;/build;/CMakeLists.txt.user;/win32-depends;/liblogdiag/ld-marshal.[ch]")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${project_VERSION}")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")

 include (CPack)

--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2010 - 2018, Přemysl Janouch <p@janouch.name>
+Copyright (c) 2010 - 2018, Přemysl Eric Janouch <p@janouch.name>

 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.
--- a/2
+++ b/2
@@ -15,7 +15,7 @@ Version 0.2.0
 - This is the last version supporting Windows XP (we use an outdated GTK+
   bundle, support for this operating system has been dropped in version 3.18).
 - Various unimportant fixes and changes.
- - Known issues: Windows XP looks ugly now and there's little we can do.
+ - Known issues: Windows XP looks ugly with the classic theme, little we can do.

 Version 0.1.2
 - Updated symbol library.
--- a/README.adoc
+++ b/README.adoc
@@ -3,8 +3,7 @@ logdiag

 'logdiag' is a simple multiplatform schematic editor written in GTK+.

-This software is considered to be of alpha quality and isn't recommended for
-regular usage.
+This software has never really been finished, and is no longer being worked on.

 image::docs/user-guide/logdiag-en.png[align="center"]

@@ -16,7 +15,7 @@ a package with the latest development version from Archlinux's AUR.
 Requirements
 ------------
 Runtime dependencies: GTK+ >= 3.8, json-glib >= 0.10.4, lua >= 5.2 +
-Build dependencies: CMake >= 2.8
+Build dependencies: CMake >= 3.9

 Build from source on Unix-like systems
 --------------------------------------
@@ -47,17 +46,18 @@ CMake offers DEB and RPM.

 After _cpack_ finishes making the package, install this file.

- $ fakeroot cpack -G DEB
+ $ cpack -G DEB
 # dpkg -i logdiag-version-system-arch.deb

-Leave out the fakeroot for CMake >= 2.8.9, it's been fixed since.
-
 Build from source on Windows
 ----------------------------
-_Note that with the current method we're stuck with GTK+ 3.10.4 at best._
+_Note that with the current method we're stuck with GTK+ 3.8.2._

-First install CMake >= 3.1 and MinGW. Add both to your system path. If you want
-to build an installation package, also install NSIS.
+First install CMake and MinGW. Add both to your system path. If you want
+to build an installation package, also install NSIS. If you want to build within
+a path containing spaces, fix your FindPkgConfig.cmake to say:
+
+ separate_arguments(_pkgconfig_invoke_result UNIX_COMMAND "${_pkgconfig_invoke_result}")

 Run the following command in the directory with source files to automatically
 fetch and setup all dependencies (contact me if the script becomes obsolete,
@@ -66,6 +66,8 @@ releasing a new version in order to resolve compatibility issues):

 > cmake -P Win32Depends.cmake

+Note that Windows XP is no longer able to reliably download from HTTPS sources.
+
 Reserve a directory for an out-of-source build:

 > mkdir build
@@ -78,18 +80,17 @@ Let CMake prepare the build:
 Now you can generate a package with CPack. You may choose between:

 1. An NSIS-based installation package:
-
+
 > cpack -G NSIS

 2. A portable ZIP package:
-
+
 > cpack -G ZIP

 By default, that is if you specify no generator, both packages are built.

 Cross-compilation for Windows
 -----------------------------
-
 The procedure is almost exactly the same as before, including the requirements.
 Just install MinGW-w64 and let automation take care of the rest.

@@ -97,10 +98,17 @@ Just install MinGW-w64 and let automation take care of the rest.
 $ mkdir build
 $ cd build
 $ cmake .. \
-   -DCMAKE_TOOLCHAIN_FILE=../ToolchainDebianMinGWW64.cmake \
+   -DCMAKE_TOOLCHAIN_FILE=../ToolchainCrossMinGWW64.cmake \
   -DCMAKE_BUILD_TYPE=Release
 $ cpack

+Alternatively, for an unnecessarily bloated MSYS2-based 64-bit build:
+
+ $ sh Win64Depends.sh
+ $ cmake -DCMAKE_TOOLCHAIN_FILE=ToolchainCrossWin64.cmake \
+   -DCMAKE_BUILD_TYPE=Release -B build
+ $ cmake --build build -- package
+
 Contributing and Support
 ------------------------
 Use https://git.janouch.name/p/logdiag to report any bugs, request features,
--- a/ToolchainDebianMinGW.cmake
+++ b/ToolchainDebianMinGW.cmake
--- a/ToolchainDebianMinGWW64.cmake
+++ b/ToolchainDebianMinGWW64.cmake
--- a/ToolchainCrossWin64.cmake
+++ b/ToolchainCrossWin64.cmake
@@ -0,0 +1,16 @@
+set (CMAKE_SYSTEM_NAME "Windows")
+set (CMAKE_SYSTEM_PROCESSOR "x86_64")
+
+set (CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc")
+set (CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++")
+set (CMAKE_RC_COMPILER "x86_64-w64-mingw32-windres")
+
+# Not needed to crosscompile an installation package
+#set (CMAKE_CROSSCOMPILING_EMULATOR "wine64")
+
+set (CMAKE_FIND_ROOT_PATH "/usr/x86_64-w64-mingw32")
+
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
--- a/Win32Depends.cmake
+++ b/Win32Depends.cmake
@@ -1,13 +1,11 @@
 # Usage: cmake -P Win32Depends.cmake

-# Only CMake 3.1+ supports XZ archives and 7z doesn't also untar automatically
-cmake_minimum_required (VERSION 3.1)
+# Only CMake 3.1+ supports XZ archives, not sure when 7z support comes from
+cmake_minimum_required (VERSION 3.9)

 # Directories
 set (working_dir ${CMAKE_CURRENT_BINARY_DIR}/win32-depends)
 set (pkg_dir ${working_dir}/packages)
-set (tools_dir ${working_dir}/tools)
-set (sevenzip_executable ${tools_dir}/7za)
 set (tmp_dir ${working_dir}/tmp)
 file (MAKE_DIRECTORY ${working_dir})
 file (MAKE_DIRECTORY ${pkg_dir})
@@ -21,27 +19,25 @@ if (files)
 endif (files)

 # Packages
-set (pkg_list "7za" "gtk" "gtkalt" "winlibs" "mingw_lua")
-
-set (pkg_7za_root "http://sourceforge.net/projects/sevenzip/files")
-set (pkg_7za_urls "${pkg_7za_root}/7-Zip/9.20/7za920.zip")
-set (pkg_7za_md5 "2fac454a90ae96021f4ffc607d4c00f8")
+set (pkg_list "gtk" "gtkalt" "winlibs" "mingw_lua")

 set (pkg_gtk_root "http://ftp.gnome.org/pub/gnome/binaries/win32")
-set (pkg_gtk_urls "${pkg_gtk_root}/dependencies/gettext-tools-0.17.zip")
-set (pkg_gtk_md5 "09baff956ebd1c391c7f71e9bd768edd")
+set (pkg_gtk_urls
+	"${pkg_gtk_root}/dependencies/gettext-tools-0.17.zip"
+	"${pkg_gtk_root}/dependencies/gettext-runtime-0.17-1.zip")
+set (pkg_gtk_md5
+	"09baff956ebd1c391c7f71e9bd768edd"
+	"110394b4b1e0a50cd440f1e8729d159c")

-set (pkg_gtkalt_root "http://win32builder.gnome.org")
+# https://sourceforge.net/projects/urlget/files
+# /GTK%2B%203%20binary%20for%20Windows/GTK%2B%203.16.6/
+# contains a binary bundle that may be more or less simply transplanted over,
+# due to ABI compatibility, however something is wrong with icons,
+# and it looks alien on Windows XP (use themes) for close to no improvement.
+set (pkg_gtkalt_root "https://download.geany.org/contrib/gtk")
 set (pkg_gtkalt_urls "${pkg_gtkalt_root}/gtk+-bundle_3.8.2-20131001_win32.zip")
 set (pkg_gtkalt_md5 "3f9b159207edf44937f209b4a5e6bb63")

-# Doesn't work, no gtk+-3.0.pc file present
-#set (pkg_gtkalt_urls "${pkg_gtkalt_root}/gtk+-bundle_3.10.4-20131202_win32.zip")
-#set (pkg_gtkalt_md5 "520bed70943974efdaeea2a1dbe48f84")
-# Too old
-#set (pkg_gtkalt_urls "${pkg_gtkalt_root}/gtk+-bundle_3.6.4-20130921_win32.zip")
-#set (pkg_gtkalt_md5 "9bcb87d917982a6e52a69141ade8bd56")
-
 set (pkg_winlibs_root "http://sourceforge.net/projects/winlibs/files")
 set (pkg_winlibs_urls "${pkg_winlibs_root}/GTK+/libjson-glib-1.0-1-mingw32.7z")
 set (pkg_winlibs_md5 "f06e42c5998dae5fb6245fecc96a403e")
@@ -66,11 +62,11 @@ foreach (pkg_set ${pkg_list})
 			message (WARNING "MD5 checksum missing for ${basename}")
 			set (pkg_md5_sum)
 			set (pkg_md5_param)
-		else (NOT pkg_md5)
+		else ()
 			list (GET pkg_md5 0 pkg_md5_sum)
 			list (REMOVE_AT pkg_md5 0)
 			set (pkg_md5_param EXPECTED_MD5 ${pkg_md5_sum})
-		endif (NOT pkg_md5)
+		endif ()

 		if (NOT EXISTS ${filename})
 			message (STATUS "Downloading ${url}...")
@@ -88,74 +84,39 @@ foreach (pkg_set ${pkg_list})
 			if (NOT output MATCHES "^${pkg_md5_sum}")
 				message (FATAL_ERROR "MD5 mismatch for ${basename}")
 			endif (NOT output MATCHES "^${pkg_md5_sum}")
-		endif (NOT EXISTS ${filename})
+		endif ()
 	endforeach (url)
 endforeach (pkg_set)

-if (NOT WIN32)
-	unset (sevenzip_executable)
-	find_program (sevenzip_executable 7za)
-	if (NOT sevenzip_executable)
-		message (FATAL_ERROR "Could not find 7za (part of p7zip)")
-	endif (NOT sevenzip_executable)
-endif (NOT WIN32)
-
-# Stage 2: setup 7za first
-file (MAKE_DIRECTORY ${tmp_dir})
-foreach (url ${pkg_7za_urls})
-	get_filename_component (filename ${url} NAME)
-	message (STATUS "Extracting ${filename}...")
-
-	set (filename ${pkg_dir}/${filename})
-	execute_process (COMMAND ${CMAKE_COMMAND} -E tar xf ${filename}
-		WORKING_DIRECTORY ${tmp_dir}
-		RESULT_VARIABLE status)
-	if (status)
-		message (FATAL_ERROR "Extraction failed: ${status}")
-	endif (status)
-endforeach (url)
-
-file (MAKE_DIRECTORY ${tools_dir})
-file (COPY ${tmp_dir}/7za.exe DESTINATION ${tools_dir})
-file (REMOVE_RECURSE ${tmp_dir})
-list (REMOVE_ITEM pkg_list "7za")
-
-# Stage 3: extract the rest of packages
+# Stage 2: extract the rest of packages
 foreach (pkg_set ${pkg_list})
 	foreach (url ${pkg_${pkg_set}_urls})
 		get_filename_component (filename ${url} NAME)
 		message (STATUS "Extracting ${filename}...")
-
-		if (filename MATCHES "\\.7z$")
-			set (extract_command ${sevenzip_executable} x)
-			set (quiet OUTPUT_QUIET)
-		else (filename MATCHES "\\.7z$")
-			set (extract_command ${CMAKE_COMMAND} -E tar xf)
-			set (quiet)
-		endif (filename MATCHES "\\.7z$")
+		set (extract_command ${CMAKE_COMMAND} -E tar xf)

 		set (filename ${pkg_dir}/${filename})
 		if (pkg_${pkg_set}_strip)
 			file (MAKE_DIRECTORY ${tmp_dir})
 			execute_process (COMMAND ${extract_command} ${filename}
 				WORKING_DIRECTORY ${tmp_dir}
-				RESULT_VARIABLE status ${quiet})
+				RESULT_VARIABLE status)
 			file (COPY ${tmp_dir}/${pkg_${pkg_set}_strip}/
 				DESTINATION ${working_dir})
 			file (REMOVE_RECURSE ${tmp_dir})
-		else (pkg_${pkg_set}_strip)
+		else ()
 			execute_process (COMMAND ${extract_command} ${filename}
 				WORKING_DIRECTORY ${working_dir}
-				RESULT_VARIABLE status ${quiet})
-		endif (pkg_${pkg_set}_strip)
+				RESULT_VARIABLE status)
+		endif ()

 		if (status)
 			message (FATAL_ERROR "Extraction failed: ${status}")
-		endif (status)
+		endif ()
 	endforeach (url)
 endforeach (pkg_set)

-# Stage 4: final touches
+# Stage 3: final touches
 # We have to fix the prefix path as it is completely wrong everywhere
 file (GLOB files ${working_dir}/lib/pkgconfig/*.pc)
 foreach (file ${files})
--- a/Win64Depends.sh
+++ b/Win64Depends.sh
@@ -0,0 +1,74 @@
+#!/bin/sh -e
+# Win64Depends.sh: download dependencies from MSYS2 for cross-compilation
+# Dependencies: AWK, sed, sha256sum, cURL, bsdtar, wine64
+repository=https://repo.msys2.org/mingw/mingw64/
+
+status() {
+	echo "$(tput bold)-- $*$(tput sgr0)"
+}
+
+dbsync() {
+	status Fetching repository DB
+	[ -f db.tsv ] || curl -# "$repository/mingw64.db" | bsdtar -xOf- | awk '
+		function flush() { print f["%NAME%"] f["%FILENAME%"] f["%DEPENDS%"] }
+		NR > 1 && $0 == "%FILENAME%" { flush(); for (i in f) delete f[i] }
+		!/^[^%]/ { field = $0; next } { f[field] = f[field] $0 "\t" }
+		field == "%SHA256SUM%" { path = "*packages/" f["%FILENAME%"]
+			sub(/\t$/, "", path); print $0, path > "db.sums" } END { flush() }
+	' > db.tsv
+}
+
+fetch() {
+	status Resolving "$@"
+	mkdir -p packages
+	awk -F'\t' 'function get(name,    i, a) {
+		if (visited[name]++ || !(name in filenames)) return
+		print filenames[name]; split(deps[name], a); for (i in a) get(a[i])
+	} BEGIN { while ((getline < "db.tsv") > 0) {
+		filenames[$1] = $2; deps[$1] = ""; for (i = 3; i <= NF; i++) {
+			gsub(/[<=>].*/, "", $i); deps[$1] = deps[$1] $i FS }
+	} for (i = 0; i < ARGC; i++) get(ARGV[i]) }' "$@" | while IFS= read -r name
+	do
+		status Fetching "$name"
+		[ -f "packages/$name" ] || curl -#o "packages/$name" "$repository/$name"
+	done
+}
+
+verify() {
+	status Verifying checksums
+	sha256sum --ignore-missing --quiet -c db.sums
+}
+
+extract() {
+	status Extracting packages
+	for subdir in *
+	do [ -d "$subdir" -a "$subdir" != packages ] && rm -rf -- "$subdir"
+	done
+	for i in packages/*
+	do bsdtar -xf "$i" --strip-components 1 mingw64
+	done
+}
+
+configure() {
+	status Configuring packages
+	glib-compile-schemas share/glib-2.0/schemas
+	wine64 bin/gdk-pixbuf-query-loaders.exe \
+		> lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+
+	# pkgconf has a command line option for this, but CMake can't pass it
+	sed -i "s|^prefix=/mingw64|prefix=$(pwd)|" {share,lib}/pkgconfig/*.pc
+}
+
+mkdir -p win32-depends
+cd win32-depends
+dbsync
+fetch mingw-w64-x86_64-gtk3 mingw-w64-x86_64-lua \
+	mingw-w64-x86_64-libwinpthread-git # because we don't do "provides"?
+verify
+extract
+configure
+
+status Success
+
+# XXX: Why is this override needed to run some GLib-based things under wine64?
+export XDG_DATA_DIRS=$(pwd)/share
--- a/cmake/FindCppCheck.cmake
+++ b/cmake/FindCppCheck.cmake
@@ -44,7 +44,7 @@

 #=============================================================================
 # Copyright 2011 Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
-# Copyright 2012 Přemysl Janouch <p at janouch dot name>
+# Copyright 2012 Přemysl Eric Janouch <p at janouch dot name>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
--- a/cmake/FindGettext.cmake
+++ b/cmake/FindGettext.cmake
@@ -1,99 +0,0 @@
-# - Find GNU gettext tools
-# This module looks for the GNU gettext tools. This module defines the
-# following values:
-#    GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
-#    GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
-#    GETTEXT_FOUND: True if gettext has been found.
-#
-# Additionally it provides the following macros:
-# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN )
-#    This will create a target "${PROJECT_NAME}_translations" which will
-#    convert the given input po files into the binary output mo file.
-#    If the ALL option is used, the translations will also be created
-#    when building the default target.
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-# Copyright 2010-2011 Přemysl Janouch
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the Kitware nor the names of contributors may be
-#       used to endorse or promote products derived from this software
-#       without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-#=============================================================================
-
-find_program (GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
-find_program (GETTEXT_MSGFMT_EXECUTABLE msgfmt)
-
-macro (GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
-	# Make it a real variable, so we can modify it here.
-	set (_firstPoFile "${_firstPoFileArg}")
-
-	set (_gmoFiles)
-	get_filename_component (_potBasename ${_potFile} NAME_WE)
-	get_filename_component (_absPotFile ${_potFile} ABSOLUTE)
-
-	set (_addToAll)
-	if (${_firstPoFile} STREQUAL "ALL")
-		set (_addToAll "ALL")
-		set (_firstPoFile)
-	endif (${_firstPoFile} STREQUAL "ALL")
-
-	foreach (_currentPoFile ${_firstPoFile} ${ARGN})
-		get_filename_component (_absFile ${_currentPoFile} ABSOLUTE)
-		get_filename_component (_abs_PATH ${_absFile} PATH)
-		get_filename_component (_lang ${_absFile} NAME_WE)
-		set (_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
-
-		# msgmerge versions older than 0.11 don't actually support --update
-		# and --backup, let's try to workaround that (tested on 0.10.40).
-		execute_process (COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} -V
-			OUTPUT_VARIABLE _msgmergeVersion)
-		string (REGEX MATCH "0[.][0-9]+" _msgmergeVersion ${_msgmergeVersion})
-		if ("${_msgmergeVersion}" MATCHES "[.]10|[.][0-9]")
-			set (_msgmergeParams --quiet -s
-				${_absFile} -o ${_absFile} ${_absPotFile})
-		else ("${_msgmergeVersion}" MATCHES "[.]10|[.][0-9]")
-			set (_msgmergeParams --quiet --update --backup=none -s
-				${_absFile} ${_absPotFile})
-		endif ("${_msgmergeVersion}" MATCHES "[.]10|[.][0-9]")
-
-		add_custom_command (
-			OUTPUT ${_gmoFile}
-			COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} ${_msgmergeParams}
-			COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
-			DEPENDS ${_absPotFile} ${_absFile}
-		)
-
-		install (FILES ${_gmoFile} DESTINATION
-			share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
-		set (_gmoFiles ${_gmoFiles} ${_gmoFile})
-	endforeach (_currentPoFile)
-
-	add_custom_target (${PROJECT_NAME}_translations ${_addToAll}
-		DEPENDS ${_gmoFiles})
-endmacro (GETTEXT_CREATE_TRANSLATIONS)
-
-include (FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (Gettext DEFAULT_MSG
-	GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE)
-
-
--- a/cmake/FindLibIntl.cmake
+++ b/cmake/FindLibIntl.cmake
@@ -5,7 +5,7 @@
 #    LIBINTL_LIBRARIES

 #=============================================================================
-# Copyright Přemysl Janouch 2011
+# Copyright 2011 Přemysl Eric Janouch
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
--- a/cmake/ProcessArguments.cmake
+++ b/cmake/ProcessArguments.cmake
@@ -22,7 +22,7 @@
 #

 #=============================================================================
-# Copyright Přemysl Janouch 2010
+# Copyright 2010 Přemysl Eric Janouch
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
--- a/config.h.in
+++ b/config.h.in
@@ -9,7 +9,7 @@
 #define __CONFIG_H__

 #define PROJECT_NAME "${PROJECT_NAME}"
-#define PROJECT_VERSION "${project_VERSION}"
+#define PROJECT_VERSION "${PROJECT_VERSION}"
 #define PROJECT_URL "${project_URL}"

 #cmakedefine OPTION_NOINSTALL
--- a/docs/user-guide/user-guide-cs.asciidoc
+++ b/docs/user-guide/user-guide-cs.asciidoc
@@ -4,7 +4,7 @@

 logdiag: Průvodce uživatele
 ===========================
-Přemysl Janouch <p@janouch.name>
+Přemysl Eric Janouch <p@janouch.name>
 v0.2.0, 2018-06-27
 :toc: left
 :toc-title: Obsah
--- a/docs/user-guide/user-guide-en.asciidoc
+++ b/docs/user-guide/user-guide-en.asciidoc
@@ -4,7 +4,7 @@

 logdiag: User Guide
 ===================
-Přemysl Janouch <p@janouch.name>
+Přemysl Eric Janouch <p@janouch.name>
 v0.2.0, 2018-06-27
 :toc: left
 :sectnums:
--- a/liblogdiag/ld-category-symbol-view.c
+++ b/liblogdiag/ld-category-symbol-view.c
@@ -2,7 +2,7 @@
 * ld-category-symbol-view.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2012
+ * Copyright 2012, 2015 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
@@ -47,6 +47,7 @@ SymbolData;
 * @path: path to the category within the library.
 * @layout: (element-type SymbolData *): current layout of symbols.
 * @preselected: currently preselected symbol.
+ * @dragged: currently dragged symbol.
 */
 struct _LdCategorySymbolViewPrivate
 {
@@ -54,6 +55,7 @@ struct _LdCategorySymbolViewPrivate
 	gchar *path;
 	GSList *layout;
 	SymbolData *preselected;
+	SymbolData *dragged;
 };

 enum
@@ -180,6 +182,7 @@ layout_destroy (LdCategorySymbolView *self)
 	g_slist_free (self->priv->layout);
 	self->priv->layout = NULL;
 	self->priv->preselected = NULL;
+	self->priv->dragged = NULL;
 }

 static GSList *
@@ -350,7 +353,10 @@ on_draw (GtkWidget *widget, cairo_t *cr)
 		return FALSE;

 	context = gtk_widget_get_style_context (widget);
-	// FIXME: there have to be better means (though I can't find them)
+
+	// XXX: alternatively, we could use gtk_style_context_lookup_color()
+	//   with hardcoded colour names ("theme_*_color")--this is cleaner,
+	//   and unlike GtkStyle doesn't cause deprecation warnings
 	gtk_style_context_add_class (context, "gtkstyle-fallback");

 	gtk_style_context_get_background_color (context,
@@ -457,12 +463,12 @@ on_drag_data_get
 	LdCategorySymbolView *self;

 	self = LD_CATEGORY_SYMBOL_VIEW (widget);
-	g_return_if_fail (self->priv->preselected != NULL);
+	g_return_if_fail (self->priv->dragged != NULL);

 	gtk_selection_data_set (selection_data,
 		gtk_selection_data_get_target (selection_data),
-		8, (guchar *) self->priv->preselected->path,
-		strlen (self->priv->preselected->path));
+		8, (guchar *) self->priv->dragged->path,
+		strlen (self->priv->dragged->path));
 }

 static void
@@ -474,6 +480,9 @@ on_drag_begin (GtkWidget *widget, GdkDragContext *ctx, gpointer user_data)
 	self = LD_CATEGORY_SYMBOL_VIEW (widget);
 	g_return_if_fail (self->priv->preselected != NULL);

+	/* Working around a mysterious bug where we /sometimes/ get deselected. */
+	self->priv->dragged = self->priv->preselected;
+
 	/* Some of the larger previews didn't work, and we have to get rid of
 	 * the icon later when we're hovering above LdDiagramView anyway. */
 	pbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
@@ -485,7 +494,11 @@ on_drag_begin (GtkWidget *widget, GdkDragContext *ctx, gpointer user_data)
 static void
 on_drag_end (GtkWidget *widget, GdkDragContext *ctx, gpointer user_data)
 {
-	symbol_deselect (LD_CATEGORY_SYMBOL_VIEW (widget));
+	LdCategorySymbolView *self;
+
+	self = LD_CATEGORY_SYMBOL_VIEW (widget);
+	symbol_deselect (self);
+	self->priv->dragged = NULL;
 }

 static void
--- a/liblogdiag/ld-category-symbol-view.h
+++ b/liblogdiag/ld-category-symbol-view.h
@@ -2,7 +2,7 @@
 * ld-category-symbol-view.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2012
+ * Copyright 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-category-tree-view.c
+++ b/liblogdiag/ld-category-tree-view.c
@@ -2,7 +2,7 @@
 * ld-category-tree-view.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011, 2012
+ * Copyright 2011, 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-category-tree-view.h
+++ b/liblogdiag/ld-category-tree-view.h
@@ -2,7 +2,7 @@
 * ld-category-tree-view.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011, 2012
+ * Copyright 2011, 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-category-view.c
+++ b/liblogdiag/ld-category-view.c
@@ -2,7 +2,7 @@
 * ld-category-view.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2012
+ * Copyright 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-category-view.h
+++ b/liblogdiag/ld-category-view.h
@@ -2,7 +2,7 @@
 * ld-category-view.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2012
+ * Copyright 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-category.c
+++ b/liblogdiag/ld-category.c
@@ -2,7 +2,7 @@
 * ld-category.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-category.h
+++ b/liblogdiag/ld-category.h
@@ -2,7 +2,7 @@
 * ld-category.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2012
+ * Copyright 2010, 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram-connection.c
+++ b/liblogdiag/ld-diagram-connection.c
@@ -2,7 +2,7 @@
 * ld-diagram-connection.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram-connection.h
+++ b/liblogdiag/ld-diagram-connection.h
@@ -2,7 +2,7 @@
 * ld-diagram-connection.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram-object.c
+++ b/liblogdiag/ld-diagram-object.c
@@ -2,7 +2,7 @@
 * ld-diagram-object.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram-object.h
+++ b/liblogdiag/ld-diagram-object.h
@@ -2,7 +2,7 @@
 * ld-diagram-object.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram-symbol.c
+++ b/liblogdiag/ld-diagram-symbol.c
@@ -2,7 +2,7 @@
 * ld-diagram-symbol.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram-symbol.h
+++ b/liblogdiag/ld-diagram-symbol.h
@@ -2,7 +2,7 @@
 * ld-diagram-symbol.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram-view.c
+++ b/liblogdiag/ld-diagram-view.c
@@ -2,7 +2,7 @@
 * ld-diagram-view.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012, 2015 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram-view.h
+++ b/liblogdiag/ld-diagram-view.h
@@ -2,7 +2,7 @@
 * ld-diagram-view.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram.c
+++ b/liblogdiag/ld-diagram.c
@@ -2,7 +2,7 @@
 * ld-diagram.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-diagram.h
+++ b/liblogdiag/ld-diagram.h
@@ -2,7 +2,7 @@
 * ld-diagram.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-library.c
+++ b/liblogdiag/ld-library.c
@@ -2,7 +2,7 @@
 * ld-library.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-library.h
+++ b/liblogdiag/ld-library.h
@@ -2,7 +2,7 @@
 * ld-library.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2012
+ * Copyright 2010, 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-lua-private.h
+++ b/liblogdiag/ld-lua-private.h
@@ -2,7 +2,7 @@
 * ld-lua-private.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010
+ * Copyright 2010 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-lua-symbol-private.h
+++ b/liblogdiag/ld-lua-symbol-private.h
@@ -2,7 +2,7 @@
 * ld-lua-symbol-private.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-lua-symbol.c
+++ b/liblogdiag/ld-lua-symbol.c
@@ -2,7 +2,7 @@
 * ld-lua-symbol.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-lua-symbol.h
+++ b/liblogdiag/ld-lua-symbol.h
@@ -2,7 +2,7 @@
 * ld-lua-symbol.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010
+ * Copyright 2010 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-lua.c
+++ b/liblogdiag/ld-lua.c
@@ -2,7 +2,7 @@
 * ld-lua.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-lua.h
+++ b/liblogdiag/ld-lua.h
@@ -2,7 +2,7 @@
 * ld-lua.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010
+ * Copyright 2010 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-symbol.c
+++ b/liblogdiag/ld-symbol.c
@@ -2,7 +2,7 @@
 * ld-symbol.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-symbol.h
+++ b/liblogdiag/ld-symbol.h
@@ -2,7 +2,7 @@
 * ld-symbol.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-types.c
+++ b/liblogdiag/ld-types.c
@@ -2,7 +2,7 @@
 * ld-types.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-types.h
+++ b/liblogdiag/ld-types.h
@@ -2,7 +2,7 @@
 * ld-types.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-undo-action.c
+++ b/liblogdiag/ld-undo-action.c
@@ -2,7 +2,7 @@
 * ld-undo-action.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/ld-undo-action.h
+++ b/liblogdiag/ld-undo-action.h
@@ -2,7 +2,7 @@
 * ld-undo-action.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/liblogdiag/liblogdiag.h
+++ b/liblogdiag/liblogdiag.h
@@ -2,7 +2,7 @@
 * liblogdiag.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011, 2012
+ * Copyright 2011, 2012 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 # Czech translation for logdiag.
-# Copyright (C) 2011 Přemysl Janouch
+# Copyright (C) 2011 Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
-# Přemysl Janouch <p@janouch.name>, 2011.
+# Přemysl Eric Janouch <p@janouch.name>, 2011.
 #
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-27 04:52+0200\n"
 "PO-Revision-Date: 2018-06-25 04:02+0200\n"
-"Last-Translator: Přemysl Janouch <p@janouch.name>\n"
+"Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -242,7 +242,7 @@ msgstr "_Přiblížit"

 #: ../src/ld-window-main.c:977
 msgid "translator-credits"
-msgstr "Přemysl Janouch <p@janouch.name>"
+msgstr "Přemysl Eric Janouch <p@janouch.name>"

 #~ msgid "The file is probably corrupted."
 #~ msgstr "Soubor je pravděpodobně poškozen."
--- a/po/de.po
+++ b/po/de.po
@@ -1,5 +1,5 @@
 # German translation for logdiag.
-# Copyright (C) 2011 Přemysl Janouch
+# Copyright (C) 2011 Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
 # Andy J., 2011.
 #
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-27 04:52+0200\n"
 "PO-Revision-Date: 2018-06-25 04:11+0200\n"
-"Last-Translator: Přemysl Janouch <p@janouch.name>\n"
+"Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
--- a/po/logdiag.pot
+++ b/po/logdiag.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Přemysl Janouch
+# Copyright (C) YEAR Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
--- a/po/make-template.sh
+++ b/po/make-template.sh
@@ -32,5 +32,5 @@ fi
 # Finally make the template
 xgettext -LC -k_ -kN_ $SOURCES -o "$PACKAGE".pot \
 	--package-name="$PACKAGE" --package-version="$VERSION" \
-	--copyright-holder="Přemysl Janouch"
+	--copyright-holder="Přemysl Eric Janouch"

--- a/po/pl.po
+++ b/po/pl.po
@@ -1,5 +1,5 @@
 # Polish translation for logdiag.
-# Copyright (C) 2011 Přemysl Janouch
+# Copyright (C) 2011 Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
 # Robert Svoboda <ravath@gmail.com>, 2011.
 #
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-27 04:52+0200\n"
 "PO-Revision-Date: 2018-06-25 04:09+0200\n"
-"Last-Translator: Přemysl Janouch <p@janouch.name>\n"
+"Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,5 +1,5 @@
 # Slovak translation for logdiag.
-# Copyright (C) 2011 Přemysl Janouch
+# Copyright (C) 2011 Přemysl Eric Janouch
 # This file is distributed under the same license as the logdiag package.
 # Miroslav Rigler <itsgoingd@luzer.sk>, 2011.
 #
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-27 04:52+0200\n"
 "PO-Revision-Date: 2018-06-25 04:05+0200\n"
-"Last-Translator: Přemysl Janouch <p@janouch.name>\n"
+"Last-Translator: Přemysl Eric Janouch <p@janouch.name>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
--- a/share/org.logdiag.gschema.xml
+++ b/share/org.logdiag.gschema.xml
@@ -1,5 +1,5 @@
 <schemalist>
-	<schema id="org.logdiag" path="/apps/logdiag/" gettext-domain="logdiag">
+	<schema id="org.logdiag" path="/org/logdiag/" gettext-domain="logdiag">
 		<key name="show-main-toolbar" type="b">
 			<default>true</default>
 			<summary>Whether to show the main toolbar</summary>
--- a/src/ld-window-main.c
+++ b/src/ld-window-main.c
@@ -2,7 +2,7 @@
 * ld-window-main.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011, 2012
+ * Copyright 2010, 2011, 2012, 2015 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
@@ -975,7 +975,7 @@ on_action_about (GtkAction *action, LdWindowMain *self)
 		"logo-icon-name", PROJECT_NAME,
 		"version", PROJECT_VERSION,
 		"translator-credits", _("translator-credits"),
-		"copyright", "Copyright Přemysl Janouch 2010 - 2018",
+		"copyright", "Copyright 2010 - 2018 Přemysl Eric Janouch",
 		"website", PROJECT_URL,
 		NULL);
 }
--- a/src/ld-window-main.h
+++ b/src/ld-window-main.h
@@ -2,7 +2,7 @@
 * ld-window-main.h
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010
+ * Copyright 2010 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/src/logdiag.c
+++ b/src/logdiag.c
@@ -2,7 +2,7 @@
 * logdiag.c -- logdiag main source file.
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2010, 2011
+ * Copyright 2010, 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
@@ -137,6 +137,7 @@ main (int argc, char *argv[])

 #ifdef _WIN32
 	/* Don't be unneccessarily limited by the system ANSI codepage. */
+	/* g_win32_get_command_line() should replace this code for GLib >= 2.40. */
 	argv_overriden = get_utf8_args (&argc, &argv);
 	if (argv_overriden)
 		_putenv ("CHARSET=UTF-8");
--- a/tests/diagram.c
+++ b/tests/diagram.c
@@ -2,7 +2,7 @@
 * diagram.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
--- a/tests/point-array.c
+++ b/tests/point-array.c
@@ -2,7 +2,7 @@
 * point-array.c
 *
 * This file is a part of logdiag.
- * Copyright Přemysl Janouch 2011
+ * Copyright 2011 Přemysl Eric Janouch
 *
 * See the file LICENSE for licensing information.
 *
Author	SHA1	Message	Date
Přemysl Eric Janouch	885ccb46a3	Win32Depends.cmake: get rid of 7z CMake 3.9 has been proven to successfully unpack 7z archives.	2021-10-22 21:53:35 +02:00
Přemysl Eric Janouch	47fb9653b8	Bump the CMake version requirement, fix Windows - Add a missing runtime library for gettext-tools. - Remove the no longer necessary customized FindGettext.cmake, since the downloaded gettext binaries are new enough. - Make the installer at least ask to uninstall previous versions. - Adjust the PATH of tests so that they'll run on Windows directly. - Fix quoting so that the project will build inside paths with spaces. - Resolve a GSettings deprecation warning. - Update the README's build instructions as appropriate. - Require CMake 3.9 because of the README's suggestion to fix FindPkgConfig.cmake manually using separate_arguments(UNIX_COMMAND). Tested build configurations: - native Arch Linux, - native Windows XP with the newest NSIS, - Arch Linux Mingw-w64 i686 Win32Depends.cmake NSIS cross-build + XP, - Arch Linux Mingw-w64 x86_64 MSYS2 NSIS cross-build + Windows 10. Detected issues: - The file save dialog will not add the extension automatically, seen with MSYS2.	2021-10-22 20:08:51 +02:00
Přemysl Eric Janouch	42b6da1ffe	README: fix cross-building instructions Copy-pasting and exhaustion do not go well together.	2021-10-22 14:41:37 +02:00
Přemysl Eric Janouch	98f16c2c76	Further minor improvements to cross-compilation	2021-10-22 01:40:29 +02:00
Přemysl Eric Janouch	03c6ae0750	Include modern build instructions for Win64 Mostly just so that the two options don't look the same.	2021-10-21 21:53:20 +02:00
Přemysl Eric Janouch	95f53863ec	Win64Depends.sh: verify package checksums Now the script has nearly reached feature parity with Win32Depends.sh, though it can't be easily run on Windows.	2021-10-21 21:37:44 +02:00
Přemysl Eric Janouch	8ac267c8db	Figure out how to abuse MSYS2 repositories In the end, all seems to work fairly well on Windows 10.	2021-10-21 19:38:37 +02:00
Přemysl Eric Janouch	45dd1a4a86	NEWS: do not lie, theme-serviced XP looks fine	2021-10-21 12:58:13 +02:00
Přemysl Eric Janouch	2c5fc3ebdd	Win32Depends.cmake: show a different upgrade path	2021-10-21 11:38:53 +02:00
Přemysl Eric Janouch	1ca42eb8e2	Update a comment about widget styling	2021-10-17 08:33:11 +02:00
Přemysl Eric Janouch	8815d72db7	Make note of the recent g_win32_get_command_line()	2021-10-14 00:36:39 +02:00
Přemysl Eric Janouch	3102bc0cb9	LdCategorySymbolView: work around a mysterious bug We sometimes get a deselecting event when toying around with menus and then dragging. There might be a simpler reproducer.	2021-07-24 10:44:19 +02:00
Přemysl Eric Janouch	7f357cb7c8	Fix Win32Depends.cmake, update README	2021-07-24 10:08:58 +02:00
Přemysl Eric Janouch	b4db65d246	CMakeLists.txt: bump minimum version to 2.8.12 To silence a deprecation warning. We should still be fine with this version.	2021-06-19 15:29:01 +02:00
Přemysl Eric Janouch	af14119165	Name change Also some copyright years fix-ups/updates.	2020-09-28 04:49:03 +02:00