From a9658fb73c59b8a7177796dc33e43872971ff3b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Dan=20Fandrich=C2=A0?= <>
Date: Wed, 9 Feb 2022 14:48:12 +0000
Subject: [PATCH] Fix #941: Update links from http: to https: where possible
https://github.com/BestImageViewer/geeqie/pull/941
Co-authored by Colin Clark
A number of links are bit-rotted and no longer work; only a few of these
are updated here. Generated links are also not touched.
---
CODING.md | 2 +-
README.md | 4 ++--
configure.ac | 6 +++---
doc/docbook/GuideIndex.xml | 2 +-
doc/docbook/GuideReferenceLIRC.xml | 2 +-
doc/docbook/GuideReferenceStandards.xml | 4 ++--
geeqie.spec.in | 2 +-
org.geeqie.Geeqie.appdata.xml.in | 6 +++---
plugins/geocode-parameters/geocode-parameters.awk | 6 +++---
plugins/rotate/geeqie-rotate | 4 ++--
src/exif-common.c | 2 +-
src/exif.c | 2 +-
src/image-load.c | 4 ++--
src/main.h | 2 +-
src/pixbuf-renderer.c | 4 ++--
src/thumb_standard.c | 3 +--
src/window.c | 4 ++--
17 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/CODING.md b/CODING.md
index 9a981592..2a4648b1 100644
--- a/CODING.md
+++ b/CODING.md
@@ -82,7 +82,7 @@ If referencing a Geeqie GitHub issue, include the issue number in the summary li
Use whole sentences beginning with Capital letter. For each modification use a new line. Or you can write the theme, colon and then every change on new line, begin with "- ".
-See also [A Note About Git Commit Messages](http://www.tpope.net/node/106)
+See also [A Note About Git Commit Messages](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
Example:
diff --git a/README.md b/README.md
index ee8931ec..d1f510cf 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ open an issue on [Geeqie at GitHub](https://github.com/BestImageViewer/geeqie/is
Subscribe to the mailing list [here](https://www.freelists.org/list/geeqie).
-The project website is and you will find the latest sources in the
+The project website is and you will find the latest sources in the
[Geeqie repository](http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git).
## Contents
@@ -84,7 +84,7 @@ Geeqie is a graphics file viewer. Basic features:
* Geeqie includes a 'find duplicates' tool which can compare images using a variety of criteria (filename, file size, visual similarity, dimensions, image content), either within a single folder or between two folders. Finding duplicates ignoring the rotation of images is also supported.
* Images may be given a rating value (also known as a "star rating").
-* Maps from [OpenStreetMap](http://www.openstreetmap.org) may be displayed in a side panel. If an image has GPS coordinates embedded, its position will be displayed on the map - if Image Direction is encoded, that will be displayed also. If an image does not have embedded GPS coordinates, it may be dragged-and-dropped onto the map to encode its position.
+* Maps from [OpenStreetMap](https://www.openstreetmap.org) may be displayed in a side panel. If an image has GPS coordinates embedded, its position will be displayed on the map - if Image Direction is encoded, that will be displayed also. If an image does not have embedded GPS coordinates, it may be dragged-and-dropped onto the map to encode its position.
* Speed of operation can be increased by caching thumbnails and similarity data of images. When Geeqie is run as a stand-alone command line program (`geeqie --cache-maintenance `) these data will be recursively created from the defined start point. This program can be called from `cron` or `anacron` so that cache updating is automatically done at specified intervals.
diff --git a/configure.ac b/configure.ac
index bab56c33..accf0296 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script. -*- Autoconf
-*-
-dnl This file is a part of Geeqie project (http://www.geeqie.org/).
+dnl This file is a part of Geeqie project (https://www.geeqie.org/).
dnl Copyright (C) 2008 - 2018 The Geeqie Team
dnl
dnl This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
AC_PREREQ(2.57)
-AC_INIT([geeqie], m4_translit(m4_esyscmd([./version.sh]), m4_newline), [geeqie@freelists.org], [], [http://www.geeqie.org/])
+AC_INIT([geeqie], m4_translit(m4_esyscmd([./version.sh]), m4_newline), [geeqie@freelists.org], [], [https://www.geeqie.org/])
# Add -Werror to the default CFLAGS
CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
@@ -789,7 +789,7 @@ AH_TOP([
*/
/*
- * This file is a part of Geeqie project (http://www.geeqie.org/).
+ * This file is a part of Geeqie project (https://www.geeqie.org/).
* Copyright (C) 2008 - 2016 The Geeqie Team
*
* This program is free software; you can redistribute it and/or modify
diff --git a/doc/docbook/GuideIndex.xml b/doc/docbook/GuideIndex.xml
index e16ece18..780b3311 100644
--- a/doc/docbook/GuideIndex.xml
+++ b/doc/docbook/GuideIndex.xml
@@ -55,7 +55,7 @@
Website:
- geeqie.org
+ geeqie.org
diff --git a/doc/docbook/GuideReferenceLIRC.xml b/doc/docbook/GuideReferenceLIRC.xml
index 34fd9a5c..e109a15d 100644
--- a/doc/docbook/GuideReferenceLIRC.xml
+++ b/doc/docbook/GuideReferenceLIRC.xml
@@ -6,7 +6,7 @@
If you are using a pre-compiled distribution, availability depends on the package maintainer.
The website
- Linux Infrared Remote Control
+ Linux Infrared Remote Control
has detailed information on this subject.
diff --git a/doc/docbook/GuideReferenceStandards.xml b/doc/docbook/GuideReferenceStandards.xml
index 383e0bea..bf9a3b50 100644
--- a/doc/docbook/GuideReferenceStandards.xml
+++ b/doc/docbook/GuideReferenceStandards.xml
@@ -7,7 +7,7 @@
Desktop files:
- http://standards.freedesktop.org/desktop-entry-spec/
+ https://standards.freedesktop.org/desktop-entry-spec/
XMP:
@@ -19,7 +19,7 @@
Pango mark up:
-
+
Thumbnails:
diff --git a/geeqie.spec.in b/geeqie.spec.in
index e6cd3ffd..8dc8bd6f 100644
--- a/geeqie.spec.in
+++ b/geeqie.spec.in
@@ -34,7 +34,7 @@ License: GNU General Public License version 2 or later (GPL v2 or later)
Group: Productivity/Graphics/Viewers
Source: geeqie-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-URL: http://www.geeqie.org/
+URL: https://www.geeqie.org/
#
# these are requirements of the plugins
Requires: exiv2 exiftran ImageMagick ufraw
diff --git a/org.geeqie.Geeqie.appdata.xml.in b/org.geeqie.Geeqie.appdata.xml.in
index 897ef762..571a1a05 100644
--- a/org.geeqie.Geeqie.appdata.xml.in
+++ b/org.geeqie.Geeqie.appdata.xml.in
@@ -16,10 +16,10 @@
- http://cclark.uk/geeqie/screenshots/Screenshot_2017-08-13_12-02-32_rescaled.png
+ https://cclark.uk/geeqie/screenshots/Screenshot_2017-08-13_12-02-32_rescaled.png
- http://cclark.uk/geeqie/screenshots/Screenshot_2017-08-13_12-29-44_rescaled.png
+ https://cclark.uk/geeqie/screenshots/Screenshot_2017-08-13_12-29-44_rescaled.png
@@ -31,7 +31,7 @@
fast
graphics
- http://geeqie.org
+ https://www.geeqie.org
geeqie@freelists.org
geeqie
diff --git a/plugins/geocode-parameters/geocode-parameters.awk b/plugins/geocode-parameters/geocode-parameters.awk
index bcdec1ec..2f2a2621 100644
--- a/plugins/geocode-parameters/geocode-parameters.awk
+++ b/plugins/geocode-parameters/geocode-parameters.awk
@@ -42,13 +42,13 @@ function check_parameters(latitude, longitude)
#
# Search the input string for known formats.
{
-if (index($0, "http://www.geonames.org/maps/google_"))
+if (index($0, "https://www.geonames.org/maps/google_"))
{
# This is a drag-and-drop or copy-paste from a geonames.org search
# in the format e.g.
- # http://www.geonames.org/maps/google_51.513_-0.092.html
+ # https://www.geonames.org/maps/google_51.513_-0.092.html
- gsub(/http:\/\/www.geonames.org\/maps\/google_/, "")
+ gsub(/https:\/\/www.geonames.org\/maps\/google_/, "")
gsub(/.html/, "")
gsub(/_/, " ")
print check_parameters($1, $2)
diff --git a/plugins/rotate/geeqie-rotate b/plugins/rotate/geeqie-rotate
index 563a8532..fcca7aed 100755
--- a/plugins/rotate/geeqie-rotate
+++ b/plugins/rotate/geeqie-rotate
@@ -31,7 +31,7 @@ rotate()
# exiftran ignores xmp, set it manually
exiv2 -M "set Xmp.tiff.Orientation 1" "$1"
[ $? != 0 ] && exit 1
- #http://dev.exiv2.org/issues/show/639
+ #http://dev.exiv2.org/issues/639
if [ -n "$gq_orientation" ] ; then
exiv2 -M "set Xmp.tiff.Orientation 1" \
-M "set Exif.Image.Orientation 1" "$gq_metadata"
@@ -52,7 +52,7 @@ rotate()
# mogrify ignores xmp, set it manually
exiv2 -M "set Xmp.tiff.Orientation 1" "$1"
[ $? != 0 ] && exit 1
- #http://dev.exiv2.org/issues/show/639
+ #http://dev.exiv2.org/issues/639
if [ -n "$gq_orientation" ] ; then
exiv2 -M "set Xmp.tiff.Orientation 1" \
-M "set Exif.Image.Orientation 1" "$gq_metadata"
diff --git a/src/exif-common.c b/src/exif-common.c
index ecd64f6d..4d14b750 100644
--- a/src/exif-common.c
+++ b/src/exif-common.c
@@ -1148,7 +1148,7 @@ gboolean exif_jpeg_parse_color(ExifData *exif, guchar *data, guint size)
* it is here because it shares tag neming infrastructure with exif
* we should probably not invest too much effort into this because
* new exiv2 will support the same functionality
- * http://dev.exiv2.org/issues/show/505
+ * https://dev.exiv2.org/issues/505
*-------------------------------------------------------------------
*/
diff --git a/src/exif.c b/src/exif.c
index 2062e89b..ec2f4ff9 100644
--- a/src/exif.c
+++ b/src/exif.c
@@ -316,7 +316,7 @@ static ExifTextList ExifSubjectRangeList[] = {
};
/*
-Tag names should match to exiv2 keys, http://www.exiv2.org/metadata.html
+Tag names should match to exiv2 keys, https://www.exiv2.org/metadata.html
Tags that don't match are not supported by exiv2 and should not be used anywhere in the code
*/
diff --git a/src/image-load.c b/src/image-load.c
index ff5bf1c6..a26929db 100644
--- a/src/image-load.c
+++ b/src/image-load.c
@@ -581,8 +581,8 @@ static void image_loader_area_prepared_cb(gpointer loader, gpointer data)
size_t h, rs;
/* a workaround for
- http://bugzilla.gnome.org/show_bug.cgi?id=547669
- http://bugzilla.gnome.org/show_bug.cgi?id=589334
+ https://bugzilla.gnome.org/show_bug.cgi?id=547669
+ https://bugzilla.gnome.org/show_bug.cgi?id=589334
*/
gchar *format = il->backend.get_format_name(loader);
if (strcmp(format, "svg") == 0 ||
diff --git a/src/main.h b/src/main.h
index 25729c67..cb8eb7a5 100644
--- a/src/main.h
+++ b/src/main.h
@@ -77,7 +77,7 @@
#define GQ_APPNAME "Geeqie"
#define GQ_APPNAME_LC "geeqie"
-#define GQ_WEBSITE "http://www.geeqie.org/"
+#define GQ_WEBSITE "https://www.geeqie.org/"
#define GQ_EMAIL_ADDRESS "geeqie@freelists.org"
#define GQ_RC_DIR "." GQ_APPNAME_LC
diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index 54a943f5..f88152ec 100644
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -2041,7 +2041,7 @@ static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpo
#endif
/* This is a hack, but work far the best, at least for single pointer systems.
- * See http://bugzilla.gnome.org/show_bug.cgi?id=587714 for more. */
+ * See https://bugzilla.gnome.org/show_bug.cgi?id=587714 for more. */
gint x, y;
#if GTK_CHECK_VERSION(3,0,0)
device_manager = gdk_display_get_device_manager(gdk_window_get_display(event->window));
@@ -2098,7 +2098,7 @@ static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpo
/* This is recommended by the GTK+ documentation, but does not work properly.
* Use deprecated way until GTK+ gets a solution for correct motion hint handling:
- * http://bugzilla.gnome.org/show_bug.cgi?id=587714
+ * https://bugzilla.gnome.org/show_bug.cgi?id=587714
*/
/* gdk_event_request_motions (event); */
return FALSE;
diff --git a/src/thumb_standard.c b/src/thumb_standard.c
index 3f7a5cca..6e892600 100644
--- a/src/thumb_standard.c
+++ b/src/thumb_standard.c
@@ -39,8 +39,7 @@
* This thumbnail caching implementation attempts to conform
* to the Thumbnail Managing Standard proposed on freedesktop.org
* The standard is documented here: \n
- * http://triq.net/~jens/thumbnail-spec/index.html \n
- * (why isn't it actually hosted on freedesktop.org?)
+ * https://www.freedesktop.org/wiki/Specifications/thumbnails/ \n
*
* This code attempts to conform to version 0.7.0 of the standard.
*
diff --git a/src/window.c b/src/window.c
index 74957598..4a20376c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -251,11 +251,11 @@ void help_window_show(const gchar *key)
{
if (g_strcmp0(key, "index.html") == 0)
{
- path = g_build_filename("http://geeqie.org/help/", "GuideIndex.html", NULL);
+ path = g_build_filename("https://www.geeqie.org/help/", "GuideIndex.html", NULL);
}
else
{
- path = g_build_filename("http://geeqie.org/help/", key, NULL);
+ path = g_build_filename("https://www.geeqie.org/help/", key, NULL);
}
}
help_browser_run(path);
--
2.20.1