summaryrefslogtreecommitdiff
path: root/net-im/coyim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--net-im/coyim/Makefile13
-rw-r--r--net-im/coyim/distinfo6
-rw-r--r--net-im/coyim/files/coyim.desktop24
-rw-r--r--net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_gtk_accel.go130
-rw-r--r--net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_pango_fontconfig.go.h12
5 files changed, 34 insertions, 151 deletions
diff --git a/net-im/coyim/Makefile b/net-im/coyim/Makefile
index 2804caa137e5..2571835efeb0 100644
--- a/net-im/coyim/Makefile
+++ b/net-im/coyim/Makefile
@@ -1,7 +1,7 @@
PORTNAME= coyim
DISTVERSIONPREFIX= v
-DISTVERSION= 0.3.11
-PORTREVISION= 30
+DISTVERSION= 0.4.1
+PORTREVISION= 3
CATEGORIES= net-im
MAINTAINER= fox@FreeBSD.org
@@ -37,11 +37,12 @@ GTK_VERSION= "$$(pkg-config --modversion gtk+-3.0 | ${TR} . _ | cut -d '_' -f 1-
GTK_BUILD_TAG= gtk_${GTK_VERSION}
COYIM_ICON= coyim.png
-COYIM_ICON_SRC= ${WRKSRC}/build/mac-bundle/coy.iconset/icon_32x32@2x.png
-COYIM_DESKTOP= ${WRKSRC}/build/coyim.desktop
+COYIM_ICON_SRC= ${WRKSRC}/build/osx/mac-bundle/coyim.iconset/icon_32x32@2x.png
+COYIM_DESKTOP= ${WRKDIR}/coyim.desktop
-pre-build:
- cd ${WRKSRC} && ${SH} ./gen_version_file.sh ${DISTVERSIONPREFIX}${DISTVERSION}
+post-extract:
+ cd ${WRKSRC} && ${RM} ./windows_amd64_icon.syso
+ cp ${FILESDIR}/coyim.desktop ${WRKDIR}
post-build:
@${REINPLACE_CMD} -e '/^#/d' \
diff --git a/net-im/coyim/distinfo b/net-im/coyim/distinfo
index 6ffbfbd0e63b..721cc457024c 100644
--- a/net-im/coyim/distinfo
+++ b/net-im/coyim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555206035
-SHA256 (coyim-coyim-v0.3.11_GH0.tar.gz) = 4717901462f027578369358c8772eb5b14e22f053fc30e4c9dbcc2b053374a41
-SIZE (coyim-coyim-v0.3.11_GH0.tar.gz) = 3803018
+TIMESTAMP = 1748633110
+SHA256 (coyim-coyim-v0.4.1_GH0.tar.gz) = f2bf1e73562fbcc3a0b264a30f92dfe427dffe2046e9f44459087ecac5890098
+SIZE (coyim-coyim-v0.4.1_GH0.tar.gz) = 7906878
diff --git a/net-im/coyim/files/coyim.desktop b/net-im/coyim/files/coyim.desktop
new file mode 100644
index 000000000000..8f728d1b5b82
--- /dev/null
+++ b/net-im/coyim/files/coyim.desktop
@@ -0,0 +1,24 @@
+# To integrate CoyIM with gnome-do, change the 'Exec' field
+# and then you may place this file in either your
+# ~/.local/share/applications/ directory (you may need
+# to create this) or your /usr/share/applications/ directory.
+# Further details can be found here:
+# https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles
+
+[Desktop Entry]
+Name=CoyIM
+Comment=Secure Instant Messenger
+# Change the path below to your local installation of coyim
+# and then uncomment the Exec field
+# Exec=/path/to/coyim/executable
+Terminal=false
+Type=Application
+# Optional:
+# To enable the correct CoyIM icon, you can download Coy.icns from:
+# https://github.com/coyim/coyim
+# It is in the directory build/mac-bundle.
+# You may place Coy.icns anywhere, but a better place would be either
+# ~/.local/share/icons/ (if .local is set up) or /usr/share/icons/
+# Then uncomment the below Icon field with the correct path
+# Icon=/path/to/Coy.icns
+Categories=Network;
diff --git a/net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_gtk_accel.go b/net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_gtk_accel.go
deleted file mode 100644
index 14ffe87739d1..000000000000
--- a/net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_gtk_accel.go
+++ /dev/null
@@ -1,130 +0,0 @@
-Solve GtkAccelKey issue with golang 1.16.
-
-https://github.com/gotk3/gotk3/pull/730
-
---- vendor/github.com/gotk3/gotk3/gtk/accel.go.orig 2019-03-22 10:58:51 UTC
-+++ vendor/github.com/gotk3/gotk3/gtk/accel.go
-@@ -69,6 +69,20 @@ func AcceleratorSetDefaultModMask(mods gdk.ModifierTyp
- }
-
- /*
-+ * GtkAccelLabel
-+ */
-+
-+// TODO:
-+// gtk_accel_label_new().
-+// gtk_accel_label_set_accel_closure().
-+// gtk_accel_label_get_accel_widget().
-+// gtk_accel_label_set_accel_widget().
-+// gtk_accel_label_get_accel_width().
-+// gtk_accel_label_set_accel(). since GTK 3.6
-+// gtk_accel_label_get_accel(). since GTK 3.12
-+// gtk_accel_label_refetch().
-+
-+/*
- * GtkAccelGroup
- */
-
-@@ -93,6 +107,10 @@ func marshalAccelGroup(p uintptr) (interface{}, error)
- }
-
- func wrapAccelGroup(obj *glib.Object) *AccelGroup {
-+ if obj == nil {
-+ return nil
-+ }
-+
- return &AccelGroup{obj}
- }
-
-@@ -191,6 +209,9 @@ func AccelGroupsFromObject(obj *glib.Object) *glib.SLi
- if res == nil {
- return nil
- }
-+
-+ // TODO: call DataWrapper on SList and wrap them to gtk.AccelGroup
-+
- return (*glib.SList)(unsafe.Pointer(res))
- }
-
-@@ -219,6 +240,10 @@ func marshalAccelMap(p uintptr) (interface{}, error) {
- }
-
- func wrapAccelMap(obj *glib.Object) *AccelMap {
-+ if obj == nil {
-+ return nil
-+ }
-+
- return &AccelMap{obj}
- }
-
-@@ -230,43 +255,24 @@ func AccelMapAddEntry(path string, key uint, mods gdk.
- C.gtk_accel_map_add_entry((*C.gchar)(cstr), C.guint(key), C.GdkModifierType(mods))
- }
-
--type AccelKey struct {
-- key uint
-- mods gdk.ModifierType
-- flags uint16
--}
-+type AccelKey C.GtkAccelKey
-
--func (v *AccelKey) native() *C.struct__GtkAccelKey {
-+func (v *AccelKey) native() *C.GtkAccelKey {
- if v == nil {
- return nil
- }
--
-- var val C.struct__GtkAccelKey
-- val.accel_key = C.guint(v.key)
-- val.accel_mods = C.GdkModifierType(v.mods)
-- val.accel_flags = v.flags
-- return &val
-+ return (*C.GtkAccelKey)(v)
- }
-
--func wrapAccelKey(obj *C.struct__GtkAccelKey) *AccelKey {
-- var v AccelKey
--
-- v.key = uint(obj.accel_key)
-- v.mods = gdk.ModifierType(obj.accel_mods)
-- v.flags = uint16(obj.accel_flags)
--
-- return &v
--}
--
- // AccelMapLookupEntry is a wrapper around gtk_accel_map_lookup_entry().
- func AccelMapLookupEntry(path string) *AccelKey {
- cstr := C.CString(path)
- defer C.free(unsafe.Pointer(cstr))
-
-- var v *C.struct__GtkAccelKey
-+ var v = new(AccelKey)
-
-- C.gtk_accel_map_lookup_entry((*C.gchar)(cstr), v)
-- return wrapAccelKey(v)
-+ C.gtk_accel_map_lookup_entry((*C.gchar)(cstr), v.native())
-+ return v
- }
-
- // AccelMapChangeEntry is a wrapper around gtk_accel_map_change_entry().
-@@ -417,7 +423,7 @@ func (v *Window) AddAccelGroup(accelGroup *AccelGroup)
- C.gtk_window_add_accel_group(v.native(), accelGroup.native())
- }
-
--// RemoveAccelGroup() is a wrapper around gtk_window_add_accel_group().
-+// RemoveAccelGroup() is a wrapper around gtk_window_remove_accel_group().
- func (v *Window) RemoveAccelGroup(accelGroup *AccelGroup) {
- C.gtk_window_remove_accel_group(v.native(), accelGroup.native())
- }
-@@ -432,4 +438,10 @@ func (v *Window) RemoveAccelGroup(accelGroup *AccelGro
- // TODO: gtk_accel_map_foreach - can't be done without a function type
-
- // TODO: gtk_accel_map_load_scanner
--// TODO: gtk_widget_list_accel_closures
-+
-+/*
-+ * GtkWidget
-+ */
-+
-+// TODO:
-+// gtk_widget_list_accel_closures
diff --git a/net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_pango_fontconfig.go.h b/net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_pango_fontconfig.go.h
deleted file mode 100644
index b88ba5525057..000000000000
--- a/net-im/coyim/files/patch-vendor_github.com_gotk3_gotk3_pango_fontconfig.go.h
+++ /dev/null
@@ -1,12 +0,0 @@
-Do proper type conversion for FreeBSD's fontconfig(3).
-
---- vendor/github.com/gotk3/gotk3/pango/fontconfig.go.h.orig 2019-04-14 03:24:49 UTC
-+++ vendor/github.com/gotk3/gotk3/pango/fontconfig.go.h
-@@ -2,6 +2,6 @@
- #include <fontconfig/fontconfig.h>
-
- static int addFont(char* font) {
-- FcBool fontAddStatus = FcConfigAppFontAddFile(FcConfigGetCurrent(), font);
-+ FcBool fontAddStatus = FcConfigAppFontAddFile(FcConfigGetCurrent(), (unsigned char*)font);
- return fontAddStatus;
- }