Fix .deb

.gitignore

@@ -1,4 +1,8 @@
 __pycache__
 plchat.build
 dist
-build
+build
+plchatdeb.py
+plchatwindows.py
+deb/**/*
+!deb/DEBIAN

Makefile

@@ -4,35 +4,52 @@ endif
 ifeq ($(LIBDIR),)
 	LIBDIR := lib/
 endif
-PRODUCTVER=0101
+VER = $(shell cat installer.cfg | grep version= | head -n 1 | sed s/version=//)
-
 
 all:	default pack
 
-fresh: 	clean default pack
-
 systemlibs: systemlibtarget pack
 
-deb: debtarget pack packdeb
+dpkg: debtarget dpkg-build
 
-windows: windowstarget
+windows: wtarget wpack
 
 default:
 	python3 -m nuitka --follow-imports --file-reference-choice=runtime --include-module=certifi --include-module=keyring.backends.kwallet --include-module=keyring.backends.chainer --enable-plugin=qt-plugins --include-qt-plugins=all --python-flag=-O -o plchat plchat.py
 
-windowstarget:
-	python3 -m nuitka --follow-imports --include-module=win32ctypes --enable-plugin=qt-plugins --include-qt-plugins=all --windows-disable-console --windows-icon-from-ico=fedi.ico --windows-company-name=plchat --windows-product-name=plchat --windows-product-version=$(PRODUCTVER) --python-flag=-O -o plchat plchat.py
-
 debtarget:
-	echo "You will need to make .deb packages using bash, ensuring you are doing so."
+	mkdir -p deb/usr/lib/plchat
-	sudo ./deb/DEBIAN/postinst
+	echo "#!/usr/lib/plchat/venv/bin/python" > deb/usr/lib/plchat/plchatdeb.py
-	source /usr/lib/plchat/venv/bin/activate
+	echo "" >> deb/usr/lib/plchat/plchatdeb.py
-	pip3 install keyring notify-py appdirs python-dateutil requests urllib3 websockets PyQt5 python-magic
+	cat plchat.py >> deb/usr/lib/plchat/plchatdeb.py
-	python3 -m nuitka --file-reference-choice=runtime --follow-imports --include-module=certifi --include-module=keyring.backends.kwallet --include-module=keyring.backends.chainer --enable-plugin=qt-plugins --include-qt-plugins=all --python-flag=-O -o plchat plchat.py
+	chmod +x deb/usr/lib/plchat/plchatdeb.py
+	cp fedi.svg deb/usr/lib/plchat
+	cp fedi.ico deb/usr/lib/plchat
+	cp send.svg deb/usr/lib/plchat
+	cp unread.svg deb/usr/lib/plchat
+	cp README.md deb/usr/lib/plchat
+	cp LICENSE deb/usr/lib/plchat
+	cp COPYING deb/usr/lib/plchat
+	cp audiowidget.py deb/usr/lib/plchat
+	cp misc.py deb/usr/lib/plchat
+	cp pleroma.py deb/usr/lib/plchat
+	cp monkeypatch.py deb/usr/lib/plchat
+	cp timeconvert.py deb/usr/lib/plchat
+	cp videowidget.py deb/usr/lib/plchat
 
 systemlibtarget:
 	python3 -m nuitka --file-reference-choice=runtime --nofollow-imports --follow-import-to=misc --follow-import-to=monkeypatch --follow-import-to=pleroma --follow-import-to=timeconvert --follow-import-to=videowidget --follow-import-to=audiowidget --python-flag=-O -o plchat plchat.py
 
+windowstarget:
+	cat windows.patch > plchatwindows.py
+	cat plchat.py >> plchatwindows.py
+	makensis -VERSION || die "No makensis in path"
+	python3 -m nsist installer.cfg
+
+wpack:
+	mv build/nsis/PlChat_$(VER).exe .
+	zip plchat_windows.zip PlChat_$(VER).exe
+
 pack:
 	mkdir dist
 	mv plchat dist
@@ -44,14 +61,14 @@ pack:
 	cp LICENSE dist
 	cp COPYING dist
 
-packdeb:
+dpkg-build:
-	mkdir -p deb/usr/lib/plchat
-	mv dist deb/usr/lib/plchat
 	dpkg --build deb
 	mv deb.deb plchat.deb
 
 clean:
 	rm -r dist || true
+	rm -r build || true
+	rm -r deb/usr || true
 
 install:
 	mkdir $(PREFIX)$(LIBDIR)

README.md

@@ -14,9 +14,11 @@ Download and install the [k-lite codec pack](https://www.codecguide.com/download
 Download the installer from https://pond.waldn.net/plchat/windows/latest.zip extract the zip file. Other versions can be found at, for example, https://pond.waldn.net/plchat/windows/1.0.1.zip . Run the installer.
 
 ### Linux
-A prepackaged deb file is provided in https://git.waldn.net/git/knotteye/plchat/releases as well as a compiled binary for amd64 linux.
+A prepackaged deb file is provided in https://git.waldn.net/git/knotteye/plchat/releases as ~~well as a compiled binary for amd64 linux~~. The precompiled binary was extremely not-portable and did not work well. Use a package or build from source.
 If you package plchat for your distro, please let me know and I will add it here.
 
+Gentoo: can be found in [this overlay](https://git.waldn.net/git/knotteye/overlay)
+
 ### MacOS
 ~~Nuitka does not support cross compilation and I do not have a working MacOS machine or VM, but it should theoretically compile and run just fine. Feel free to message me for support, and I'll be glad to link to your site if you host any binaries you build.~~
 A macos binary has been provided by [~am](https://decept.org/users/am). You can find it on the releases page. Run `brew install libmagic` before running.

deb/DEBIAN/control

@@ -1,11 +1,11 @@
 Package: plchat
-Version: 1.0.1
+Version: 1.0.2
 Section: net
 Priority: optional
-Architecture: amd64
+Architecture: all
 Description: A pleroma chat client
 Homepage: https://git.waldn.net/git/knotteye/plchat
 Maintainer: Knott Eye <knotteye@airmail.cc>
 Pre-Depends: python3 (>= 3.8.0~), python3-pip (>= 19.3), python3-venv, bash
-Depends: dbus, libmagic1, libc6, gstreamer1.0-nice, gstreamer1.0-libav, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-good, gstreamer1.0-plugins-ugly, gstreamer1.0-qt5, gstreamer1.0-plugins-base, gstreamer1.0-python3-plugin-loader
+Depends: dbus, libmagic1, libc6, gstreamer1.0-nice, gstreamer1.0-libav, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-good, gstreamer1.0-plugins-ugly, gstreamer1.0-qt5, gstreamer1.0-plugins-base, gstreamer1.0-python3-plugin-loader, python3-keyring, python3-appdirs, python3-magic, python3-dateutil, python3-websockets, python3-requests, python3-dateutil, python3-urllib3
 Suggests: gnome-keyring

deb/DEBIAN/postinst

@@ -1,7 +1,10 @@
 #!/bin/bash
 mkdir -p /usr/lib/plchat
 cd /usr/lib/plchat
-python3 -m venv venv
+python3 -m venv --system-site-packages venv
 source venv/bin/activate
-pip3 install PyQt5==5.15.4 PyQt5-Qt5 PyQt5-sip certifi cryptography
+pip3 install PyQt5==5.15.4 PyQt5-Qt5 PyQt5-sip notify-py
-ln -sf /usr/lib/plchat/dist/plchat /usr/bin/plchat
+echo "#!/bin/sh" > /usr/bin/plchat
+echo "/usr/lib/plchat/venv/bin/python /usr/plib/plchat/plchatdeb.py" >> /usr/bin/plchat
+chmod +x /usr/bin/plchat
+

deb/DEBIAN/postrm

@@ -1,3 +1,3 @@
 #!/bin/sh
 rm -f /usr/bin/plchat
-
+rm -rf /usr/lib/plchat

installer.cfg

@@ -1,7 +1,7 @@
 [Application]
 name=PlChat
-version=1.0.1
+version=1.0.2
-script=plchat.py
+script=plchatwindows.py
 icon=fedi.ico
 license_file=LICENSE
 console=false
@@ -51,4 +51,4 @@ packages= audiowidget
 	plchat
 	pleroma
 	timeconvert
-	videowidget
+	videowidget