pool/qemacs
SHA256
10
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 903879 from home:susnux:branches:M17N

Browse Source 
Update to 0.3.3

OBS-URL: https://build.opensuse.org/request/show/903879
OBS-URL: https://build.opensuse.org/package/show/M17N/qemacs?expand=0&rev=8
This commit is contained in:
Takashi Iwai
2021-07-16 14:45:36 +00:00
committed by Git OBS Bridge
parent 66fcdb142a
commit 03c8ac4754
8 changed files with 37 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
gcc4.patch
View File

@@ -1,47 +0,0 @@
diff -ru qemacs-0.3.1.orig/charset.c qemacs-0.3.1/charset.c
--- qemacs-0.3.1.orig/charset.c 2003-04-22 00:01:42.000000000 +0200
+++ qemacs-0.3.1/charset.c 2005-04-12 19:00:13.000000000 +0200
@@ -20,7 +20,7 @@
QECharset *first_charset = NULL;
-extern QECharset charset_7bit;
+static QECharset charset_7bit;
/* specific tables */
static unsigned short table_idem[256];
diff -ru qemacs-0.3.1.orig/tty.c qemacs-0.3.1/tty.c
--- qemacs-0.3.1.orig/tty.c 2003-04-22 00:01:42.000000000 +0200
+++ qemacs-0.3.1/tty.c 2005-04-12 19:05:58.000000000 +0200
@@ -70,7 +70,7 @@
return 1;
}
-extern QEDisplay tty_dpy;
+static QEDisplay tty_dpy;
static int term_init(QEditScreen *s, int w, int h)
{
diff -ru qemacs-0.3.1.orig/unicode_join.c qemacs-0.3.1/unicode_join.c
--- qemacs-0.3.1.orig/unicode_join.c 2003-04-22 00:01:42.000000000 +0200
+++ qemacs-0.3.1/unicode_join.c 2005-04-12 19:04:48.000000000 +0200
@@ -182,6 +182,7 @@
*q++ = l1;
i++;
found:
+ ;
}
}
return q - buf_out;
diff -ru qemacs-0.3.1.orig/x11.c qemacs-0.3.1/x11.c
--- qemacs-0.3.1.orig/x11.c 2003-04-22 00:01:42.000000000 +0200
+++ qemacs-0.3.1/x11.c 2005-04-12 19:07:21.000000000 +0200
@@ -76,7 +76,7 @@
static CSSRect update_rects[UPDATE_MAX_REGIONS];
#endif
-extern QEDisplay x11_dpy;
+static QEDisplay x11_dpy;
static int visual_depth;
static int force_tty = 0;

20
includes.patch
View File

@@ -1,20 +0,0 @@
--- cutils.c
+++ cutils.c
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <stdarg.h>
#include <ctype.h>
+#include <string.h>
#include "cutils.h"
--- libfbf.c
+++ libfbf.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdlib.h>
+#include <string.h>
#include "libfbf.h"

2
initcall.patch
View File

@@ -30,4 +30,4 @@
+#define __exit_call __attribute__ ((used,__section__ (".exitcall.exit")))
#define qe_module_init(fn) \
static int (*__initcall_##fn)(void) __init_call = fn
int (*__initcall_##fn)(void) __init_call = fn

3
qemacs-0.3.1.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3078d584757d711fde2641e88c65a4a487cde6b9739869aeaa0e4bb0ea37295
size 771363

3
qemacs-0.3.3.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ffba66a44783849282199acfcc08707debc7169394a8fd0902626222f27df94
size 821944

9
qemacs.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Jul 3 20:03:47 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to 0.3.3
* fixed HTML mode in 64 bit mode
* added C-x s save-buffer mapping
- Drop upstream fixed patches: gcc4.patch and includes.patch
- Fix URL and SourceURL
-------------------------------------------------------------------
Wed Mar 14 00:31:43 UTC 2018 - jengelh@inai.de

12
qemacs.patch
View File

@@ -28,18 +28,6 @@ diff -Nru qemacs-0.3.1.orig/Makefile qemacs-0.3.1/Makefile
TAGS: force
etags *.[ch]
diff -Nru qemacs-0.3.1.orig/configure qemacs-0.3.1/configure
--- qemacs-0.3.1.orig/configure 2003-04-30 18:20:45.000000000 +0200
+++ qemacs-0.3.1/configure 2003-04-30 21:22:07.000000000 +0200
@@ -311,7 +311,7 @@
head $source_path/VERSION >>config.mak
echo "" >>config.mak
echo -n "#define QE_VERSION \"" >> $TMPH
-head $source_path/VERSION >> $TMPH
+head $source_path/VERSION | tr --delete '\n' >> $TMPH
echo "\"" >> $TMPH
if test "$network" = "yes" ; then
echo "#define CONFIG_NETWORK 1" >> $TMPH
diff -Nru qemacs-0.3.1.orig/qemacs.1 qemacs-0.3.1/qemacs.1
--- qemacs-0.3.1.orig/qemacs.1 1970-01-01 01:00:00.000000000 +0100
+++ qemacs-0.3.1/qemacs.1 2003-04-30 21:22:27.000000000 +0200
@@ -0,0 +1 @@

52
qemacs.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package qemacs
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,32 +12,30 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: qemacs
Version: 0.3.3
Release: 0
Summary: An editor similar to Emacs
License: LGPL-2.1-or-later
Group: Productivity/Editors/Other
URL: https://bellard.org/qemacs/
Source0: https://bellard.org/qemacs/qemacs-%{version}.tar.gz
Patch0: qemacs.patch
Patch1: qemacs-lib64.patch
Patch2: initcall.patch
Patch3: qemacs-libpng.patch
# PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- pgajdos@suse.com; build with libpng15; sent today to fabrice.bellard@free.fr
# build against libpng14 should not be affected, otherwise please let me know
Patch4: qemacs-libpng15.patch
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xv)
Version: 0.3.1
Release: 0
Url: http://fabrice.bellard.free.fr/qemacs/
Source0: http://fabrice.bellard.free.fr/qemacs/qemacs-0.3.1.tar.bz2
Patch0: qemacs.patch
Patch1: qemacs-lib64.patch
Patch2: gcc4.patch
Patch3: includes.patch
Patch4: initcall.patch
Patch5: qemacs-libpng.patch
# PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- pgajdos@suse.com; build with libpng15; sent today to fabrice.bellard@free.fr
# build against libpng14 should not be affected, otherwise please let me know
Patch6: qemacs-libpng15.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: An editor similar to Emacs
License: LGPL-2.1-or-later
Group: Productivity/Editors/Other
%description
Full screen editor with an Emacs look and feel with common Emacs features
@@ -72,11 +70,9 @@ completion and history. Additional features:
%setup -q
%patch0 -p1
%patch1 -p1 -b .lib64
%patch2 -p1
%patch2
%patch3
%patch4
%patch5
%patch6 -p1
%patch4 -p1
%build
export CFLAGS="%{optflags}"
@@ -91,11 +87,11 @@ make STRIP=:
chmod 644 %{buildroot}/%{_mandir}/man1/*
%files
%defattr(-,root,root)
%doc COPYING Changelog README TODO qe-doc.html config.eg
%license COPYING
%doc Changelog README TODO qe-doc.html config.eg
%doc tests/
/usr/bin/*
/usr/share/qe/
%doc %{_mandir}/man1/*
%{_bindir}/*
%{_datadir}/qe/
%{_mandir}/man1/*
%changelog