pool/emacs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify patch emacs-25.3-xft4x11.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=252
This commit is contained in:
Dr. Werner Fink 2018-06-15 05:55:53 +00:00 committed by Git OBS Bridge
parent 14f698de1d
commit 09105ce5ec
3 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
emacs-26.1-xft4x11.patch Normal file
View File

@ -0,0 +1,33 @@
---
lwlib/xlwmenu.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
--- lwlib/xlwmenu.c
+++ lwlib/xlwmenu.c 2018-06-15 05:50:45.749287186 +0000
@@ -1887,21 +1887,18 @@ XlwMenuInitialize (Widget request, Widge
gray_width, gray_height,
(unsigned long)1, (unsigned long)0, 1);
+ mw->menu.font = XLoadQueryFont (display, mw->menu.fontName);
#ifdef HAVE_XFT
- if (openXftFont (mw))
+ if (mw->menu.font || openXftFont (mw))
;
else
#endif
{
- mw->menu.font = XLoadQueryFont (display, mw->menu.fontName);
+ mw->menu.font = XLoadQueryFont (display, "fixed");
if (!mw->menu.font)
{
- mw->menu.font = XLoadQueryFont (display, "fixed");
- if (!mw->menu.font)
- {
- fprintf (stderr, "Menu font fixed not found, can't continue.\n");
- emacs_abort ();
- }
+ fprintf (stderr, "Menu font fixed not found, can't continue.\n");
+ emacs_abort ();
}
}

18
emacs.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Fri Jun 15 05:14:18 UTC 2018 - werner@suse.de
- Simplify patch emacs-25.3-xft4x11.patch (from Henryk Hecht) for
boo#1096354
-------------------------------------------------------------------
Tue Jun 12 07:52:20 UTC 2018 - werner@suse.de
- Add patch emacs-26.1-xft4x11.patch to allow emacs-x11 to use
xft even for its menu bar (boo#1096354)
-------------------------------------------------------------------
Fri Jun 8 17:35:59 UTC 2018 - bjorn.lie@gmail.com
- Drop pkgconfig(gconf-2.0) BuildRequires: No longer needed, nor
used. Emacs-x11 uses gsettings on openSUSE.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 7 13:05:03 UTC 2018 - werner@suse.de Thu Jun 7 13:05:03 UTC 2018 - werner@suse.de

7
emacs.spec
View File

@ -68,11 +68,12 @@ BuildRequires: xz
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: pkgconfig(com_err) BuildRequires: pkgconfig(com_err)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libacl)
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(sm)
@ -88,7 +89,9 @@ BuildRequires: pkgconfig(xmu)
BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xshmfence)
BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xxf86vm)
Url: http://www.gnu.org/software/emacs/ Url: http://www.gnu.org/software/emacs/
Version: 26.1 Version: 26.1
Release: 0 Release: 0
@ -259,7 +262,7 @@ if test -s autogen.sh ; then
ln -sf /bin/true autogen.sh ln -sf /bin/true autogen.sh
fi fi
%else %else
autoreconf -fiv autoreconf -fiv -I $PWD -I $PWD/m4
%endif %endif
# make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769) # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769)