From 63b2780499728b664d1fcb83d9f23b4236ad4043 Mon Sep 17 00:00:00 2001
From: Cassowary <cassowary@aldercone.studio>
Date: Thu, 7 Dec 2023 13:07:58 -0800
Subject: [PATCH] Fix about dialog again. Update readme with more complete deps

---
 README                     |  2 +-
 app/dialogs/about-dialog.c | 47 --------------------------------------
 app/pdb/image-cmds.c       |  2 +-
 libpika/pika_pdb_headers.h |  2 +-
 4 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/README b/README
index 94e4946..61f5070 100644
--- a/README
+++ b/README
@@ -45,7 +45,7 @@ libgexiv2-dev libglib2.0-dev libgs-dev libgtk-3-dev libgudev-1.0-dev libharfbuzz
 libjson-glib-dev liblcms2-dev libmng-dev libmypaint-dev libopenexr-dev libopenjp2-7-dev libpango1.0-dev libpng-dev
 libpoppler-dev libpoppler-glib-dev librsvg2-dev libtiff-dev libunwind-dev libwebp-dev libwmf-dev libx11-dev
 libxcursor-dev libxext-dev libxfixes-dev libxmu-dev libxpm-dev libzstd-dev luajit meson mypaint-brushes ninja-build
-pappler-data python3-gi-dev xmllint xsltproc
+poppler-data python3-gi libxml2-utils xsltproc gobject-introspection libgirepository1.0-dev libbz2-dev gettext
 
 Seems like a lot! But many of these are for format support. This is for the maximal setup we've tested.
 
diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
index 68b4af0..94c23cd 100644
--- a/app/dialogs/about-dialog.c
+++ b/app/dialogs/about-dialog.c
@@ -40,20 +40,12 @@
 #include "git-version.h"
 
 #include "about-dialog.h"
-#include "authors.h"
 #include "pika-update.h"
 #include "pika-version.h"
 
 #include "pika-intl.h"
 
 
-/* The first authors are the creators and maintainers, don't shuffle
- * them
- */
-#define START_INDEX (G_N_ELEMENTS (creators)    - 1 /*NULL*/ + \
-                     G_N_ELEMENTS (maintainers) - 1 /*NULL*/)
-
-
 typedef struct
 {
   GtkWidget      *dialog;
@@ -66,9 +58,6 @@ typedef struct
   GtkWidget      *anim_area;
   PangoLayout    *layout;
 
-  gint            n_authors;
-  gint            shuffle[G_N_ELEMENTS (authors) - 1];  /* NULL terminated */
-
   guint           timer;
 
   gint            index;
@@ -122,7 +111,6 @@ about_dialog_create (Pika           *pika,
       gchar     *version;
 
       dialog.pika      = pika;
-      dialog.n_authors = G_N_ELEMENTS (authors) - 1;
       dialog.config    = config;
 
       pixbuf = about_dialog_load_logo ();
@@ -151,12 +139,6 @@ about_dialog_create (Pika           *pika,
                              "logo",               pixbuf,
                              "website",            "https://heckin.technology/AlderconeStudio/PIKApp/",
                              "website-label",      _("Visit the PIKA website"),
-                             "authors",            authors,
-                             "artists",            artists,
-                             "documenters",        documenters,
-                             /* Translators: insert your names here,
-                                separated by newline */
-                             "translator-credits", _("translator-credits"),
                              NULL);
 
       if (pixbuf)
@@ -490,27 +472,6 @@ about_dialog_add_update (PikaAboutDialog *dialog,
 static void
 about_dialog_reshuffle (PikaAboutDialog *dialog)
 {
-  GRand *gr = g_rand_new ();
-  gint   i;
-
-  for (i = 0; i < dialog->n_authors; i++)
-    dialog->shuffle[i] = i;
-
-  for (i = START_INDEX; i < dialog->n_authors; i++)
-    {
-      gint j = g_rand_int_range (gr, START_INDEX, dialog->n_authors);
-
-      if (i != j)
-        {
-          gint t;
-
-          t = dialog->shuffle[j];
-          dialog->shuffle[j] = dialog->shuffle[i];
-          dialog->shuffle[i] = t;
-        }
-    }
-
-  g_rand_free (gr);
 }
 
 static gboolean
@@ -691,14 +652,6 @@ about_dialog_timer (gpointer data)
           dialog->state += 1;
           break;
 
-        case 2:
-          if (! (dialog->index < dialog->n_authors))
-            dialog->index = 0;
-
-          text = insert_spacers (authors[dialog->shuffle[dialog->index]]);
-          dialog->index += 1;
-          break;
-
         default:
           g_return_val_if_reached (TRUE);
           break;
diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c
index 930702d..593bdf3 100644
--- a/app/pdb/image-cmds.c
+++ b/app/pdb/image-cmds.c
@@ -5101,7 +5101,7 @@ register_image_procs (PikaPDB *pdb)
                                "pika-image-get-imported-file");
   pika_procedure_set_static_help (procedure,
                                   "Returns the imported file for the specified image.",
-                                  "This procedure returns the file associated with the specified image if the image was imported from a non-native Pika format. If the image was not imported, or has since been saved in the native Pika format, this procedure returns %NULL.",
+                                  "This procedure returns the file associated with the specified image if the image was imported from a non-native Pika format. If the image was not imported, or has since been saved in the native Gimp format, this procedure returns %NULL.",
                                   NULL);
   pika_procedure_set_static_attribution (procedure,
                                          "Eric Grivel <pika@lumenssolutions.com>",
diff --git a/libpika/pika_pdb_headers.h b/libpika/pika_pdb_headers.h
index 08df6d5..5876aea 100644
--- a/libpika/pika_pdb_headers.h
+++ b/libpika/pika_pdb_headers.h
@@ -47,7 +47,6 @@
 #include <libpika/pikafont_pdb.h>
 #include <libpika/pikafonts_pdb.h>
 #include <libpika/pikafontselect_pdb.h>
-#include <libpika/pikapikarc_pdb.h>
 #include <libpika/pikagradient_pdb.h>
 #include <libpika/pikagradients_pdb.h>
 #include <libpika/pikagradientselect_pdb.h>
@@ -72,6 +71,7 @@
 #include <libpika/pikapattern_pdb.h>
 #include <libpika/pikapatterns_pdb.h>
 #include <libpika/pikapatternselect_pdb.h>
+#include <libpika/pikapikarc_pdb.h>
 #include <libpika/pikaprogress_pdb.h>
 #include <libpika/pikaresource_pdb.h>
 #include <libpika/pikaselection_pdb.h>