lfp

commit 50266c4fd2d67dc5ab4633f204acf47f35bc83e0

Author: Connor Etherington <[email protected]>

Date:   Sun Dec 3 04:33:09 2023 +0200

    Auto-Commit Update - 20231203

---

 PKGBUILD                                           |   3 ++-

 README.md                                          |   2 +-

 ...-manylinux_2_17_x86_64.manylinux2014_x86_64.whl | Bin 0 -> 59525 bytes

 lfpreviewer/lfpreviewer/X/X.c                      |   6 +++---

 lfpreviewer/lfpreviewer/X/X.h                      |   2 +-

 lfpreviewer/lfpreviewer/X/Xshm.c                   |   2 +-

 lfpreviewer/lfpreviewer/X/Xshm.h                   |   2 +-

 lfpreviewer/lfpreviewer/X/display.c                |   2 +-

 lfpreviewer/lfpreviewer/X/display.h                |   2 +-

 lfpreviewer/lfpreviewer/X/window.c                 |   2 +-

 lfpreviewer/lfpreviewer/X/window.h                 |   2 +-

 lfpreviewer/setup.py                               |  23 ++++++++++++++-------

 usr/share/doc/lfp/README.md                        |   2 +-

 13 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index 2f70ec4..41cc234 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -1,7 +1,7 @@

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=lfp

-pkgver=4.1.3

+pkgver=4.1.4

 pkgrel=1

 pkgdesc='A wrapper for the lf file manager with in-terminal media previews, on-exit directory changing and much more'

 license=('MIT')

@@ -33,6 +33,7 @@ package() {

   cd "$srcdir/${pkgname}/lfpreviewer"

   pip install . --root="$pkgdir" --prefix=/usr --no-deps

+  pip install ./lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl 2>/dev/null || true

   cd "$srcdir/${pkgname}-${pkgver}-${pkgrel}-${arch}" >/dev/null 2>&1 ||

   cd "$srcdir/${pkgname}"

diff --git a/README.md b/README.md

index eb2462a..c59564b 100644

--- a/README.md

+++ b/README.md

@@ -4,7 +4,7 @@

 ### `lfp` is a simple wrapper for the `lf` file manager, with built-in file, image, and video previews, as well as on-exit directory changing.

 ### The program makes use of `ueberzug` to preview images, documents, and video thumbnails. Preview behavior can be altered by editing the *scope* file.

-**Version: 4.1.3**

+**Version: 4.1.4**

 ***

diff --git a/lfpreviewer/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/lfpreviewer/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

new file mode 100644

index 0000000..7408f51

Binary files /dev/null and b/lfpreviewer/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl differ

diff --git a/lfpreviewer/lfpreviewer/X/X.c b/lfpreviewer/lfpreviewer/X/X.c

index ac2c09a..c6f6d91 100644

--- a/lfpreviewer/lfpreviewer/X/X.c

+++ b/lfpreviewer/lfpreviewer/X/X.c

@@ -1,4 +1,4 @@

-#include "python.h"

+#include <Python.h>

 #include "display.h"

 #include "window.h"

 #include "Xshm.h"

@@ -6,8 +6,8 @@

 static PyModuleDef module = {

     PyModuleDef_HEAD_INIT,

-    .m_name = "lfpreviewer.X",

-    .m_doc = "Modul which implements the interaction with the Xshm extension.",

+    .m_name = "X",

+    .m_doc = "Module which implements the interaction with the Xshm extension.",

     .m_size = -1,

 };

diff --git a/lfpreviewer/lfpreviewer/X/X.h b/lfpreviewer/lfpreviewer/X/X.h

index 2523c59..01d1108 100644

--- a/lfpreviewer/lfpreviewer/X/X.h

+++ b/lfpreviewer/lfpreviewer/X/X.h

@@ -1,6 +1,6 @@

 #ifndef __X_H__

 #define __X_H__

-#include "python.h"

+#include <Python.h>

 PyModuleDef module;

diff --git a/lfpreviewer/lfpreviewer/X/Xshm.c b/lfpreviewer/lfpreviewer/X/Xshm.c

index b68919a..8885a65 100644

--- a/lfpreviewer/lfpreviewer/X/Xshm.c

+++ b/lfpreviewer/lfpreviewer/X/Xshm.c

@@ -1,4 +1,4 @@

-#include "python.h"

+#include <Python.h>

 #include <stdbool.h>

 #include <sys/shm.h>

diff --git a/lfpreviewer/lfpreviewer/X/Xshm.h b/lfpreviewer/lfpreviewer/X/Xshm.h

index ab61b4d..d6c623e 100644

--- a/lfpreviewer/lfpreviewer/X/Xshm.h

+++ b/lfpreviewer/lfpreviewer/X/Xshm.h

@@ -1,6 +1,6 @@

 #ifndef __XSHM_H__

 #define __XSHM_H__

-#include "python.h"

+#include <Python.h>

 extern PyTypeObject ImageType;

diff --git a/lfpreviewer/lfpreviewer/X/display.c b/lfpreviewer/lfpreviewer/X/display.c

index c9e4eee..28fcb22 100644

--- a/lfpreviewer/lfpreviewer/X/display.c

+++ b/lfpreviewer/lfpreviewer/X/display.c

@@ -1,4 +1,4 @@

-#include "python.h"

+#include <Python.h>

 #include <X11/Xlib.h>

 #include <X11/extensions/XRes.h>

diff --git a/lfpreviewer/lfpreviewer/X/display.h b/lfpreviewer/lfpreviewer/X/display.h

index 8492607..df0ef13 100644

--- a/lfpreviewer/lfpreviewer/X/display.h

+++ b/lfpreviewer/lfpreviewer/X/display.h

@@ -1,7 +1,7 @@

 #ifndef __DISPLAY_H__

 #define __DISPLAY_H__

-#include "python.h"

+#include <Python.h>

 #include <X11/Xlib.h>

diff --git a/lfpreviewer/lfpreviewer/X/window.c b/lfpreviewer/lfpreviewer/X/window.c

index 471f378..ffc63b9 100644

--- a/lfpreviewer/lfpreviewer/X/window.c

+++ b/lfpreviewer/lfpreviewer/X/window.c

@@ -1,4 +1,4 @@

-#include "python.h"

+#include <Python.h>

 #include <stdbool.h>

 #include <X11/Xlib.h>

diff --git a/lfpreviewer/lfpreviewer/X/window.h b/lfpreviewer/lfpreviewer/X/window.h

index ac59417..d0063f7 100644

--- a/lfpreviewer/lfpreviewer/X/window.h

+++ b/lfpreviewer/lfpreviewer/X/window.h

@@ -1,6 +1,6 @@

 #ifndef __WINDOW_H__

 #define __WINDOW_H__

-#include "python.h"

+#include <Python.h>

 extern PyTypeObject WindowType;

diff --git a/lfpreviewer/setup.py b/lfpreviewer/setup.py

index 3413522..1294c16 100644

--- a/lfpreviewer/setup.py

+++ b/lfpreviewer/setup.py

@@ -2,27 +2,34 @@

 import setuptools

 import glob

+from setuptools import setup, Extension

+

+X = Extension(

+    'lfpreviewer.X',

+    sources=glob.glob('lfpreviewer/X/*.c'),

+    include_dirs=['lfpreviewer/X/'],

+    libraries=['X11', 'Xext', 'XRes'],

+)

 setuptools.setup(

     name='lfpreviewer',

-    version='0.1.0',

-    description='Previewer for lfp',

-    license='GPLv3',

+    version='1.0.1',

+    ext_modules=[X],

+    description='Image Previewer for LFP',

+    license='MIT/X Consortium License',

     python_requires='>=3.6',

     install_requires=['docopt', 'attrs>=18.2.0', 'pillow'],

+    sources=glob.glob('lfpreviewer/X/*.c'),

+    include_dirs=['lfpreviewer/X/'],

     include_package_data=True,

     package_data={ '': ['*.sh'] },

     packages=setuptools.find_packages(),

     entry_points={ 'console_scripts': [

         'lfpreviewer=lfpreviewer.__main__:main'

     ]},

-    ext_modules=[

-        setuptools.Extension("lfpreviewer.X", glob.glob("lfpreviewer/X/*.c"),

-        libraries=["X11", "Xext", "XRes"], include_dirs=["lfpreviewer/X"]),

-    ],

     classifiers=[

         'Environment :: Console',

         'Environment :: X11 Applications',

-        'Operating System :: POSIX :: Linux',

+        'Operating System :: POSIX :: Linux'

     ]

 )

diff --git a/usr/share/doc/lfp/README.md b/usr/share/doc/lfp/README.md

index ae2a3ff..d145740 100644

--- a/usr/share/doc/lfp/README.md

+++ b/usr/share/doc/lfp/README.md

@@ -4,7 +4,7 @@

 ### `lfp` is a simple wrapper for the `lf` file manager, with built-in file, image, and video previews, as well as on-exit directory changing.

 ### The program makes use of `ueberzug` to preview images, documents, and video thumbnails. Preview behavior can be altered by editing the *scope* file.

-**Version: 4.1.3**

+**Version: 4.1.4**

 ***