retext: bump version.

This commit is contained in:
Jerome Duval
2017-08-03 22:04:44 +02:00
parent a347be028e
commit 05cb891030
3 changed files with 32 additions and 39 deletions

View File

@@ -1,38 +0,0 @@
From 64086ebfcd26e89474df38e91430507d4ef0b03d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 28 Jan 2017 11:43:21 +0100
Subject: find_library() doesn't work on Haiku.
diff --git a/ReText/xsettings.py b/ReText/xsettings.py
index a5647a0..0fbfa4d 100644
--- a/ReText/xsettings.py
+++ b/ReText/xsettings.py
@@ -53,15 +53,15 @@ class XSettingsParseError(XSettingsError):
def get_raw_xsettings(display=0):
# initialize the libraries
- xcb_library_name = ctypes.util.find_library('xcb')
- if xcb_library_name is None:
- raise XSettingsError('Xcb library not found')
- xcb = ctypes.CDLL(xcb_library_name)
-
- c_library_name = ctypes.util.find_library('c')
- if c_library_name is None:
- raise XSettingsError('C library not found')
- c = ctypes.CDLL(c_library_name)
+ # xcb_library_name = ctypes.util.find_library('xcb')
+ # if xcb_library_name is None:
+ # raise XSettingsError('Xcb library not found')
+ xcb = ctypes.CDLL('libxcb.so.1')
+
+ #c_library_name = ctypes.util.find_library('c')
+ #if c_library_name is None:
+ # raise XSettingsError('C library not found')
+ c = ctypes.CDLL('libroot.so')
# set some args and return types
xcb.xcb_connect.argtypes = [ctypes.c_char_p, ctypes.POINTER(ctypes.c_int)]
--
2.10.2

View File

@@ -0,0 +1,30 @@
From 33686e58997fa8a035474e01e8a80dbb46070d4d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 3 Aug 2017 21:57:44 +0200
Subject: read/write with encoding utf-8.
diff --git a/setup.py b/setup.py
index f065e42..a3e5d03 100755
--- a/setup.py
+++ b/setup.py
@@ -112,14 +112,14 @@ class retext_install(install):
desktop_file_path = join(self.install_data, 'share', 'applications',
'me.mitya57.ReText.desktop')
icon_path = join(self.orig_install_data, 'share', 'retext', 'icons', 'retext.svg')
- with open(desktop_file_path) as desktop_file:
+ with open(desktop_file_path, encoding="utf-8") as desktop_file:
desktop_contents = desktop_file.read()
print('fixing Exec line in %s' % desktop_file_path)
desktop_contents = desktop_contents.replace('Exec=retext', 'Exec=%s' % retext)
if self.orig_install_data != '/usr':
print('fixing Icon line in %s' % desktop_file_path)
desktop_contents = desktop_contents.replace('Icon=retext', 'Icon=%s' % icon_path)
- with open(desktop_file_path, 'w') as desktop_file:
+ with open(desktop_file_path, 'w', encoding="utf-8") as desktop_file:
desktop_file.write(desktop_contents)
--
2.13.1

View File

@@ -7,7 +7,7 @@ COPYRIGHT="20112016 Dmitry Shachnev
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="$HOMEPAGE/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="7df3fcdad1d1f9a046ae33591b54dd7a6894de64eb0370f2dabf4cd75eb66586"
CHECKSUM_SHA256="c32ccdbcf31094258c792bc0589ff3ff212dea85466d776b7f60fa7b39da4b6c"
PATCHES="retext-$portVersion.patchset"
ARCHITECTURES="any"
@@ -31,6 +31,7 @@ BUILD_REQUIRES="
setuptools_python3
"
BUILD_PREREQUIRES="
cmd:lrelease
cmd:python3
"