lfp


Logs | Files | README | LICENSE | GitLab


1
commit 50266c4fd2d67dc5ab4633f204acf47f35bc83e0
2
Author: Connor Etherington <[email protected]>
3
Date:   Sun Dec 3 04:33:09 2023 +0200
4
5
    Auto-Commit Update - 20231203
6
---
7
 PKGBUILD                                           |   3 ++-
8
 README.md                                          |   2 +-
9
 ...-manylinux_2_17_x86_64.manylinux2014_x86_64.whl | Bin 0 -> 59525 bytes
10
 lfpreviewer/lfpreviewer/X/X.c                      |   6 +++---
11
 lfpreviewer/lfpreviewer/X/X.h                      |   2 +-
12
 lfpreviewer/lfpreviewer/X/Xshm.c                   |   2 +-
13
 lfpreviewer/lfpreviewer/X/Xshm.h                   |   2 +-
14
 lfpreviewer/lfpreviewer/X/display.c                |   2 +-
15
 lfpreviewer/lfpreviewer/X/display.h                |   2 +-
16
 lfpreviewer/lfpreviewer/X/window.c                 |   2 +-
17
 lfpreviewer/lfpreviewer/X/window.h                 |   2 +-
18
 lfpreviewer/setup.py                               |  23 ++++++++++++++-------
19
 usr/share/doc/lfp/README.md                        |   2 +-
20
 13 files changed, 29 insertions(+), 21 deletions(-)
21
22
diff --git a/PKGBUILD b/PKGBUILD
23
index 2f70ec4..41cc234 100644
24
--- a/PKGBUILD
25
+++ b/PKGBUILD
26
@@ -1,7 +1,7 @@
27
 # Maintainer: Connor Etherington <[email protected]>
28
 # ---
29
 pkgname=lfp
30
-pkgver=4.1.3
31
+pkgver=4.1.4
32
 pkgrel=1
33
 pkgdesc='A wrapper for the lf file manager with in-terminal media previews, on-exit directory changing and much more'
34
 license=('MIT')
35
@@ -33,6 +33,7 @@ package() {
36
   cd "$srcdir/${pkgname}/lfpreviewer"
37
 
38
   pip install . --root="$pkgdir" --prefix=/usr --no-deps
39
+  pip install ./lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl 2>/dev/null || true
40
 
41
   cd "$srcdir/${pkgname}-${pkgver}-${pkgrel}-${arch}" >/dev/null 2>&1 ||
42
   cd "$srcdir/${pkgname}"
43
diff --git a/README.md b/README.md
44
index eb2462a..c59564b 100644
45
--- a/README.md
46
+++ b/README.md
47
@@ -4,7 +4,7 @@
48
 ### `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.
49
 ### The program makes use of `ueberzug` to preview images, documents, and video thumbnails. Preview behavior can be altered by editing the *scope* file.
50
 
51
-**Version: 4.1.3**
52
+**Version: 4.1.4**
53
 
54
 ***
55
 
56
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
57
new file mode 100644
58
index 0000000..7408f51
59
Binary files /dev/null and b/lfpreviewer/lfpreviewer-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl differ
60
diff --git a/lfpreviewer/lfpreviewer/X/X.c b/lfpreviewer/lfpreviewer/X/X.c
61
index ac2c09a..c6f6d91 100644
62
--- a/lfpreviewer/lfpreviewer/X/X.c
63
+++ b/lfpreviewer/lfpreviewer/X/X.c
64
@@ -1,4 +1,4 @@
65
-#include "python.h"
66
+#include <Python.h>
67
 #include "display.h"
68
 #include "window.h"
69
 #include "Xshm.h"
70
@@ -6,8 +6,8 @@
71
 
72
 static PyModuleDef module = {
73
     PyModuleDef_HEAD_INIT,
74
-    .m_name = "lfpreviewer.X",
75
-    .m_doc = "Modul which implements the interaction with the Xshm extension.",
76
+    .m_name = "X",
77
+    .m_doc = "Module which implements the interaction with the Xshm extension.",
78
     .m_size = -1,
79
 };
80
 
81
diff --git a/lfpreviewer/lfpreviewer/X/X.h b/lfpreviewer/lfpreviewer/X/X.h
82
index 2523c59..01d1108 100644
83
--- a/lfpreviewer/lfpreviewer/X/X.h
84
+++ b/lfpreviewer/lfpreviewer/X/X.h
85
@@ -1,6 +1,6 @@
86
 #ifndef __X_H__
87
 #define __X_H__
88
-#include "python.h"
89
+#include <Python.h>
90
 
91
 
92
 PyModuleDef module;
93
diff --git a/lfpreviewer/lfpreviewer/X/Xshm.c b/lfpreviewer/lfpreviewer/X/Xshm.c
94
index b68919a..8885a65 100644
95
--- a/lfpreviewer/lfpreviewer/X/Xshm.c
96
+++ b/lfpreviewer/lfpreviewer/X/Xshm.c
97
@@ -1,4 +1,4 @@
98
-#include "python.h"
99
+#include <Python.h>
100
 
101
 #include <stdbool.h>
102
 #include <sys/shm.h>
103
diff --git a/lfpreviewer/lfpreviewer/X/Xshm.h b/lfpreviewer/lfpreviewer/X/Xshm.h
104
index ab61b4d..d6c623e 100644
105
--- a/lfpreviewer/lfpreviewer/X/Xshm.h
106
+++ b/lfpreviewer/lfpreviewer/X/Xshm.h
107
@@ -1,6 +1,6 @@
108
 #ifndef __XSHM_H__
109
 #define __XSHM_H__
110
-#include "python.h"
111
+#include <Python.h>
112
 
113
 
114
 extern PyTypeObject ImageType;
115
diff --git a/lfpreviewer/lfpreviewer/X/display.c b/lfpreviewer/lfpreviewer/X/display.c
116
index c9e4eee..28fcb22 100644
117
--- a/lfpreviewer/lfpreviewer/X/display.c
118
+++ b/lfpreviewer/lfpreviewer/X/display.c
119
@@ -1,4 +1,4 @@
120
-#include "python.h"
121
+#include <Python.h>
122
 
123
 #include <X11/Xlib.h>
124
 #include <X11/extensions/XRes.h>
125
diff --git a/lfpreviewer/lfpreviewer/X/display.h b/lfpreviewer/lfpreviewer/X/display.h
126
index 8492607..df0ef13 100644
127
--- a/lfpreviewer/lfpreviewer/X/display.h
128
+++ b/lfpreviewer/lfpreviewer/X/display.h
129
@@ -1,7 +1,7 @@
130
 #ifndef __DISPLAY_H__
131
 #define __DISPLAY_H__
132
 
133
-#include "python.h"
134
+#include <Python.h>
135
 
136
 #include <X11/Xlib.h>
137
 
138
diff --git a/lfpreviewer/lfpreviewer/X/window.c b/lfpreviewer/lfpreviewer/X/window.c
139
index 471f378..ffc63b9 100644
140
--- a/lfpreviewer/lfpreviewer/X/window.c
141
+++ b/lfpreviewer/lfpreviewer/X/window.c
142
@@ -1,4 +1,4 @@
143
-#include "python.h"
144
+#include <Python.h>
145
 
146
 #include <stdbool.h>
147
 #include <X11/Xlib.h>
148
diff --git a/lfpreviewer/lfpreviewer/X/window.h b/lfpreviewer/lfpreviewer/X/window.h
149
index ac59417..d0063f7 100644
150
--- a/lfpreviewer/lfpreviewer/X/window.h
151
+++ b/lfpreviewer/lfpreviewer/X/window.h
152
@@ -1,6 +1,6 @@
153
 #ifndef __WINDOW_H__
154
 #define __WINDOW_H__
155
-#include "python.h"
156
+#include <Python.h>
157
 
158
 
159
 extern PyTypeObject WindowType;
160
diff --git a/lfpreviewer/setup.py b/lfpreviewer/setup.py
161
index 3413522..1294c16 100644
162
--- a/lfpreviewer/setup.py
163
+++ b/lfpreviewer/setup.py
164
@@ -2,27 +2,34 @@
165
 
166
 import setuptools
167
 import glob
168
+from setuptools import setup, Extension
169
+
170
+X = Extension(
171
+    'lfpreviewer.X',
172
+    sources=glob.glob('lfpreviewer/X/*.c'),
173
+    include_dirs=['lfpreviewer/X/'],
174
+    libraries=['X11', 'Xext', 'XRes'],
175
+)
176
 
177
 setuptools.setup(
178
     name='lfpreviewer',
179
-    version='0.1.0',
180
-    description='Previewer for lfp',
181
-    license='GPLv3',
182
+    version='1.0.1',
183
+    ext_modules=[X],
184
+    description='Image Previewer for LFP',
185
+    license='MIT/X Consortium License',
186
     python_requires='>=3.6',
187
     install_requires=['docopt', 'attrs>=18.2.0', 'pillow'],
188
+    sources=glob.glob('lfpreviewer/X/*.c'),
189
+    include_dirs=['lfpreviewer/X/'],
190
     include_package_data=True,
191
     package_data={ '': ['*.sh'] },
192
     packages=setuptools.find_packages(),
193
     entry_points={ 'console_scripts': [
194
         'lfpreviewer=lfpreviewer.__main__:main'
195
     ]},
196
-    ext_modules=[
197
-        setuptools.Extension("lfpreviewer.X", glob.glob("lfpreviewer/X/*.c"),
198
-        libraries=["X11", "Xext", "XRes"], include_dirs=["lfpreviewer/X"]),
199
-    ],
200
     classifiers=[
201
         'Environment :: Console',
202
         'Environment :: X11 Applications',
203
-        'Operating System :: POSIX :: Linux',
204
+        'Operating System :: POSIX :: Linux'
205
     ]
206
 )
207
diff --git a/usr/share/doc/lfp/README.md b/usr/share/doc/lfp/README.md
208
index ae2a3ff..d145740 100644
209
--- a/usr/share/doc/lfp/README.md
210
+++ b/usr/share/doc/lfp/README.md
211
@@ -4,7 +4,7 @@
212
 ### `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.
213
 ### The program makes use of `ueberzug` to preview images, documents, and video thumbnails. Preview behavior can be altered by editing the *scope* file.
214
 
215
-**Version: 4.1.3**
216
+**Version: 4.1.4**
217
 
218
 ***
219