On Sat 13/02/2021 21:57, Christian Weisgerber wrote:
> Bjorn Ketelaars:
>
> > Fix taken from
> > https://gitlab.gnome.org/GNOME/atomix/-/commit/be7f44f1945a569494d46c60eaf6e7b39b2bb48b.patch
>
> There also seem to be much newer versions available.
>
> https://download.gnome.org/sources/atomix/3.34/
> atomix-3.34.0.tar.xz 519.6 KiB 2019-Sep-09 19:16
>
> That will still need the patch, but might be worth an update anyway?
> To catch up with 13 years of changes?
Yes, you are right, it is worth an update. For now update to 3.22.0 as
newer versions depend on libgnome-games-support, which - I think - is
not in ports. Upstream provided the -fno-common fix.
Run tested on amd64.
OK?
diff --git Makefile Makefile
index bb1a981256b..3ab05350380 100644
--- Makefile
+++ Makefile
@@ -2,39 +2,27 @@
COMMENT= build molecules out of single atoms
-DISTNAME= atomix-2.14.0
-REVISION= 14
+DISTNAME= atomix-3.22.0
CATEGORIES= games
-EXTRACT_SUFX= .tar.bz2
-MASTER_SITES= ${MASTER_SITE_GNOME:=/sources/atomix/2.14/}
-
-HOMEPAGE = https://wiki.gnome.org/Apps/Atomix
+HOMEPAGE= https://wiki.gnome.org/Apps/Atomix
# GPLv2+
PERMIT_PACKAGE= Yes
-WANTLIB = GL ICE ORBit-2 SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 bonobo-2
-WANTLIB += bonobo-activation bonoboui-2 c cairo expat fontconfig
-WANTLIB += freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gnome-2 gnomecanvas-2 gnomeui-2 gnomevfs-2
-WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png popt pthread xcb
-WANTLIB += xcb-render xcb-shm xml2 z
+WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz intl m
+WANTLIB += pango-1.0 pangocairo-1.0 pthread
+
+MASTER_SITES= ${MASTER_SITE_GNOME:=/sources/atomix/3.22/}
+EXTRACT_SUFX= .tar.xz
MODULES= textproc/intltool
-LIB_DEPENDS= x11/gnome/libgnome \
- x11/gnome/libgnomeui
+LIB_DEPENDS= x11/gtk+3
RUN_DEPENDS= devel/desktop-file-utils
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
-
-post-install:
- ${INSTALL_DATA} ${WRKINST}/var/games/atomix.scores \
- ${PREFIX}/share/atomix/atomix.scores
-
.include <bsd.port.mk>
diff --git distinfo distinfo
index 9ebf8d06b74..09769f729de 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (atomix-2.14.0.tar.bz2) = XU4HPCnn0j1Jsb/M6e3x6PDAS9uR2zaOBehU4rJja7g=
-SIZE (atomix-2.14.0.tar.bz2) = 284987
+SHA256 (atomix-3.22.0.tar.xz) = lcr3kYE4HswXJfx2uTeiRAZAc5u0z7r/kdt55xTnQn8=
+SIZE (atomix-3.22.0.tar.xz) = 551424
diff --git patches/patch-src_Makefile_in patches/patch-src_Makefile_in
deleted file mode 100644
index 637ae21fac8..00000000000
--- patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2017/11/05 11:31:29 espie Exp $
-
-Index: src/Makefile.in
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -236,7 +236,7 @@ atomix_SOURCES = \
- atomix_DEPENDENCIES = libatomix.a
- atomix_LDADD = \
- libatomix.a \
-- $(ATOMIX_LIBS)
-+ $(ATOMIX_LIBS) -lm
-
- noinst_LIBRARIES = libatomix.a
- libatomix_a_SOURCES = \
diff --git patches/patch-src_level_c patches/patch-src_level_c
new file mode 100644
index 00000000000..6ae181a9516
--- /dev/null
+++ patches/patch-src_level_c
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://gitlab.gnome.org/GNOME/atomix/-/commit/be7f44f1945a569494d46c60eaf6e7b39b2bb48b
+
+Index: src/level.c
+--- src/level.c.orig
++++ src/level.c
+@@ -31,7 +31,7 @@ static void level_class_init (GObjectClass *class);
+ static void level_init (Level *level);
+ static void level_finalize (GObject *object);
+
+-GObjectClass *parent_class;
++static GObjectClass *parent_class;
+
+ /*=================================================================
+
diff --git patches/patch-src_main_c patches/patch-src_main_c
deleted file mode 100644
index fce2b056a25..00000000000
--- patches/patch-src_main_c
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_main_c,v 1.1.1.1 2008/01/14 23:21:04 simon Exp $
---- src/main.c.orig Sun Jan 13 01:47:06 2008
-+++ src/main.c Sun Jan 13 01:53:34 2008
-@@ -149,6 +149,11 @@ static void verb_EditPreferences_cb (BonoboUIComponent
- #endif
- }
-
-+static void verb_CloseAbout_cb (GtkWidget *dialog, gpointer user_data)
-+{
-+ gtk_widget_destroy (dialog);
-+}
-+
- static void verb_HelpAbout_cb (BonoboUIComponent *uic, gpointer user_data,
- const char *cname)
- {
-@@ -175,6 +180,9 @@ static void verb_HelpAbout_cb (BonoboUIComponent *uic,
- gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(dlg), authors);
- gtk_about_dialog_set_artists (GTK_ABOUT_DIALOG(dlg), artists);
- gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG(dlg),
_("translator-credits"));
-+
-+ g_signal_connect (dlg, "close", G_CALLBACK(verb_CloseAbout_cb), NULL);
-+ g_signal_connect (dlg, "response", G_CALLBACK(verb_CloseAbout_cb), NULL);
-
- gtk_widget_show (dlg);
- }
diff --git patches/patch-src_theme_c patches/patch-src_theme_c
new file mode 100644
index 00000000000..f9c52481a3b
--- /dev/null
+++ patches/patch-src_theme_c
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build error. Taken from
+https://gitlab.gnome.org/GNOME/atomix/-/commit/be7f44f1945a569494d46c60eaf6e7b39b2bb48b
+
+Index: src/theme.c
+--- src/theme.c.orig
++++ src/theme.c
+@@ -32,7 +32,7 @@ static void theme_init (Theme *theme);
+ static void theme_finalize (GObject *object);
+ static void destroy_theme_image (gpointer data);
+
+-GObjectClass *parent_class;
++static GObjectClass *parent_class;
+
+ GType theme_get_type (void)
+ {
diff --git pkg/PLIST pkg/PLIST
index f2889cc9e9c..b30c489ca35 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -4,15 +4,11 @@
@bin bin/atomix
@mode
@group
+share/appdata/
+share/appdata/atomix.appdata.xml
share/applications/atomix.desktop
share/atomix/
share/atomix/atomix-logo.png
-@mode g+w
-@group games
-share/atomix/atomix.scores
-@sample /var/games/atomix.scores
-@mode
-@group
share/atomix/level/
share/atomix/level/aceticacid.atomix.xml
share/atomix/level/acetone.atomix.xml
@@ -81,6 +77,80 @@ share/atomix/themes/default/wall-vertical-leftx.png
share/atomix/themes/default/wall-vertical-rightx.png
share/atomix/themes/default/wall-vertical-top-end.png
share/atomix/themes/default/wall-vertical.png
-share/gnome-2.0/ui/atomix-ui.xml
-share/pixmaps/atomix-icon.png
@tag update-desktop-database
+share/atomix/ui/
+share/atomix/ui/interface.ui
+share/icons/hicolor/16x16/apps/atomix.png
+share/icons/hicolor/22x22/apps/atomix.png
+share/icons/hicolor/24x24/apps/atomix.png
+share/icons/hicolor/256x256/apps/atomix.png
+share/icons/hicolor/32x32/apps/atomix.png
+share/icons/hicolor/48x48/apps/atomix.png
+share/icons/hicolor/512x512/apps/atomix.png
+share/icons/hicolor/symbolic/apps/atomix-symbolic.svg
+share/locale/af/LC_MESSAGES/atomix.mo
+share/locale/am/LC_MESSAGES/atomix.mo
+share/locale/ar/LC_MESSAGES/atomix.mo
+share/locale/az/LC_MESSAGES/atomix.mo
+share/locale/be/LC_MESSAGES/atomix.mo
+share/locale/bg/LC_MESSAGES/atomix.mo
+share/locale/bn/LC_MESSAGES/atomix.mo
+share/locale/bs/LC_MESSAGES/atomix.mo
+share/locale/ca/LC_MESSAGES/atomix.mo
+share/locale/cs/LC_MESSAGES/atomix.mo
+share/locale/da/LC_MESSAGES/atomix.mo
+share/locale/de/LC_MESSAGES/atomix.mo
+share/locale/dz/LC_MESSAGES/atomix.mo
+share/locale/el/LC_MESSAGES/atomix.mo
+share/locale/en_CA/LC_MESSAGES/atomix.mo
+share/locale/en_GB/LC_MESSAGES/atomix.mo
+share/locale/eo/LC_MESSAGES/atomix.mo
+share/locale/es/LC_MESSAGES/atomix.mo
+share/locale/et/LC_MESSAGES/atomix.mo
+share/locale/eu/LC_MESSAGES/atomix.mo
+share/locale/fa/LC_MESSAGES/atomix.mo
+share/locale/fi/LC_MESSAGES/atomix.mo
+share/locale/fr/LC_MESSAGES/atomix.mo
+share/locale/ga/LC_MESSAGES/atomix.mo
+share/locale/gl/LC_MESSAGES/atomix.mo
+share/locale/gu/LC_MESSAGES/atomix.mo
+share/locale/he/LC_MESSAGES/atomix.mo
+share/locale/hi/LC_MESSAGES/atomix.mo
+share/locale/hu/LC_MESSAGES/atomix.mo
+share/locale/id/LC_MESSAGES/atomix.mo
+share/locale/is/LC_MESSAGES/atomix.mo
+share/locale/it/LC_MESSAGES/atomix.mo
+share/locale/ja/LC_MESSAGES/atomix.mo
+share/locale/ka/LC_MESSAGES/atomix.mo
+share/locale/kn/LC_MESSAGES/atomix.mo
+share/locale/ko/LC_MESSAGES/atomix.mo
+share/locale/lt/LC_MESSAGES/atomix.mo
+share/locale/lv/LC_MESSAGES/atomix.mo
+share/locale/mk/LC_MESSAGES/atomix.mo
+share/locale/ml/LC_MESSAGES/atomix.mo
+share/locale/ms/LC_MESSAGES/atomix.mo
+share/locale/nb/LC_MESSAGES/atomix.mo
+share/locale/nl/LC_MESSAGES/atomix.mo
+share/locale/oc/LC_MESSAGES/atomix.mo
+share/locale/pa/LC_MESSAGES/atomix.mo
+share/locale/pl/LC_MESSAGES/atomix.mo
+share/locale/pt/LC_MESSAGES/atomix.mo
+share/locale/pt_BR/LC_MESSAGES/atomix.mo
+share/locale/ro/LC_MESSAGES/atomix.mo
+share/locale/ru/LC_MESSAGES/atomix.mo
+share/locale/sk/LC_MESSAGES/atomix.mo
+share/locale/sl/LC_MESSAGES/atomix.mo
+share/locale/sq/LC_MESSAGES/atomix.mo
+share/locale/sr/LC_MESSAGES/atomix.mo
+share/locale/sr@latin/LC_MESSAGES/atomix.mo
+share/locale/sv/LC_MESSAGES/atomix.mo
+share/locale/ta/LC_MESSAGES/atomix.mo
+share/locale/th/LC_MESSAGES/atomix.mo
+share/locale/tr/LC_MESSAGES/atomix.mo
+share/locale/uk/LC_MESSAGES/atomix.mo
+share/locale/vi/LC_MESSAGES/atomix.mo
+share/locale/wa/LC_MESSAGES/atomix.mo
+share/locale/zh_CN/LC_MESSAGES/atomix.mo
+share/locale/zh_HK/LC_MESSAGES/atomix.mo
+share/locale/zh_TW/LC_MESSAGES/atomix.mo
+@tag gtk-update-icon-cache %D/share/icons/hicolor
