commit 298c0066fac2a5bea2e7e542be35d4cadceefaa7
Author: Jakub Bogusz <[email protected]>
Date: Tue Nov 24 16:46:57 2015 +0100
- initial
mrg-format.patch | 20 +++++++++
mrg-mm.patch | 80 ++++++++++++++++++++++++++++++++++++
mrg.spec | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 221 insertions(+)
---
diff --git a/mrg.spec b/mrg.spec
new file mode 100644
index 0000000..6cb1713
--- /dev/null
+++ b/mrg.spec
@@ -0,0 +1,121 @@
+Summary: Microraptor GUI
+Summary(pl.UTF-8): Microraptor GUI - graficzny interfejs użytkownika
+Name: mrg
+Version: 0
+%define gitref b0cb507a366775a008cf083e1bcac07623d04ae2
+%define snap 20150728
+Release: 0.%{snap}.1
+License: LGPL v2+
+Group: Libraries
+Source0:
https://github.com/hodefoting/mrg/archive/%{gitref}/%{name}-%{snap}.tar.gz
+# Source0-md5: 16a5c79cd09c25b5c28bc8f9a1e35066
+Patch0: %{name}-mm.patch
+Patch1: %{name}-format.patch
+URL: https://github.com/hodefoting/mrg/
+BuildRequires: SDL-devel >= 1.2
+BuildRequires: cairo-devel
+BuildRequires: mmm-devel
+BuildRequires: gtk+3-devel >= 3.0
+BuildRequires: pkgconfig
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Immediate UI framework with cairo. Also a minimal usable graphical
+user environment built using the framework, including: a shell/host
+for client programs, a terminal emulator, file browser and text editor
+written using the library.
+
+%description -l pl.UTF-8
+Pośredni szkielet interfejsu użytkownika wykorzystujący cairo. Zawiera
+także zbudowane przy użyciu tego szkieletu minimalne używalne
+graficzne środowisko użytkownika, zawierające: powłokę/hosta dla
+programów klienckich, emulator terminala, przeglądarkę plików oraz
+edytor tekstu.
+
+%package libs
+Summary: Shared mrg library
+Summary(pl.UTF-8): Biblioteka współdzielona mrg
+Group: Libraries
+
+%description libs
+Shared mrg library.
+
+%description libs -l pl.UTF-8
+Biblioteka współdzielona mrg.
+
+%package devel
+Summary: Header files for mrg library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki mrg
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: cairo-devel
+Requires: mmm-devel
+Requires: gtk+3-devel >= 3.0
+
+%description devel
+Header files for mrg library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki mrg.
+
+%package static
+Summary: Static mrg library
+Summary(pl.UTF-8): Statyczna biblioteka mrg
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static mrg library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka mrg.
+
+%prep
+%setup -q -n %{name}-%{gitref}
+%patch0 -p1
+%patch1 -p1
+
+%build
+# not autoconf configure
+./configure \
+ CFLAGS="%{rpmcflags} -std=gnu99"\
+ --prefix=%{_prefix} \
+ --libdir=%{_libdir}
+%{__make} \
+ CC="%{__cc}" \
+ LD="%{__cc}" \
+ LD_FLAGS="%{rpmldflags}"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc README.md
+%attr(755,root,root) %{_bindir}/mrg
+%attr(755,root,root) %{_bindir}/mrg-browser
+%attr(755,root,root) %{_bindir}/mrg-edit
+%attr(755,root,root) %{_bindir}/mrg-host
+%attr(755,root,root) %{_bindir}/mrg-terminal
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmrg.so
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/mrg
+%{_pkgconfigdir}/mrg.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libmrg.a
diff --git a/mrg-format.patch b/mrg-format.patch
new file mode 100644
index 0000000..a5cfd48
--- /dev/null
+++ b/mrg-format.patch
@@ -0,0 +1,20 @@
+--- mrg-b0cb507a366775a008cf083e1bcac07623d04ae2/lib/nchanterm.c.orig
2015-07-27 19:55:34.000000000 +0200
++++ mrg-b0cb507a366775a008cf083e1bcac07623d04ae2/lib/nchanterm.c
2015-11-23 21:57:25.049098794 +0100
+@@ -990,7 +990,7 @@
+ signal (SIGWINCH, nc_resize_term);
+ }
+ if (mouse_mode)
+- printf(mouse_modes[mouse_mode]);
++ printf("%s", mouse_modes[mouse_mode]);
+
+ {
+ int elapsed = 0;
+@@ -1152,7 +1152,7 @@
+ mode = 1;
+ if (mode != mouse_mode)
+ {
+- printf (mouse_modes[mode]);
++ printf ("%s", mouse_modes[mode]);
+ fflush (stdout);
+ }
+ mouse_mode = mode;
diff --git a/mrg-mm.patch b/mrg-mm.patch
new file mode 100644
index 0000000..024cf10
--- /dev/null
+++ b/mrg-mm.patch
@@ -0,0 +1,80 @@
+--- mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/bin.orig 2015-04-15
17:22:26.000000000 +0200
++++ mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/bin 2015-11-23
19:55:08.826073329 +0100
+@@ -12,11 +12,11 @@
+ BIN_LD_FLAGS += $(shell test "$(BIN_PKGMODULES)" 2>/dev/null && pkg-config
$(BIN_PKGMODULES) --libs)
+
+ $(BINARY): $(BIN_CFILES) $(LIBNAME_A)
+- @echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS)
$(BIN_LD_FLAGS) \
+- $(BIN_CFILES) $(LIBNAME_A) -o $@
++ echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS) \
++ $(BIN_CFILES) $(LIBNAME_A) $(BIN_LD_FLAGS) -o $@
+
+ $(BINARY).efence: $(BIN_CFILES) $(LIBNAME_A)
+- @echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS)
$(BIN_LD_FLAGS) \
+- $(BIN_CFILES) $(LIBNAME_A) -lefence -o $@
++ echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS) \
++ $(BIN_CFILES) $(LIBNAME_A) $(BIN_LD_FLAGS) -lefence -o $@
+
+ all: $(BIN_TARGETS)
+--- mrg-b0cb507a366775a008cf083e1bcac07623d04ae2/.mm/lib.orig 2015-11-23
20:53:44.365925795 +0100
++++ mrg-b0cb507a366775a008cf083e1bcac07623d04ae2/.mm/lib 2015-11-23
20:56:53.995917836 +0100
+@@ -16,23 +16,23 @@
+ LIBNAME_A=$(LIBNAME).a
+
+ $(LIBNAME).a: $(LIB_OBJS)
+- @echo " AR" $@;ar rcs $@ $(LIB_OBJS)
++ echo " AR" $@;ar rcs $@ $(LIB_OBJS)
+
+ CLEAN_FILES += symbols
+
+ symbols: Makefile $(LIB_OBJS)
+- @echo " gen" $@; nm -a $(LIB_OBJS) | grep " T " | cut -f 3 -d ' ' |
grep "^$(SYMBOL_PREFIX)" | grep -v "^_" | sort > $@
++ echo " gen" $@; nm -a $(LIB_OBJS) | grep " T " | cut -f 3 -d ' ' |
grep "^$(SYMBOL_PREFIX)" | grep -v "^_" | sort > $@
+
+ $(LIBNAME).$(LIBEXT): $(LIB_OBJS) symbols
+- @echo " LD" $@;$(LD) -shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
++ echo " LD" $@;$(LD) -shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
+
+ # this rule is generic and could also belong with bin..
+ # we try to be overly generic and throw in the cflags of both lib and bin..
+ %.o: %.c *.h $(LIB_HFILES)
+- @echo " CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
++ echo " CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
+
+ lib/%.o: lib/%.c lib/*.h $(LIB_HFILES)
+- @echo " CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
++ echo " CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
+
+ LIBDIR ?= $(PREFIX)/lib
+ #$(P64)
+@@ -71,7 +71,7 @@
+ EXAMPLES_LD_FLAGS += $(shell test "$(EXAMPLES_PKGMODULES)" 2>/dev/null &&
pkg-config $(EXAMPLES_PKGMODULES) --libs | sed 's/-Wl,--export-dynamic//' | sed
's/-pthread//')
+
+ examples/%: examples/%.c $(LIBNAME).a
+- @echo "CCLD" $@; $(CC) -I.. -I. $(EXAMPLES_CFLAGS) $(LIB_CFLAGS)
$(LIB_LD_FLAGS) $(EXAMPLES_LD_FLAGS) $< $(LIBNAME).a -o $@
++ echo "CCLD" $@; $(CC) -I.. -I. $(EXAMPLES_CFLAGS) $(LIB_CFLAGS)
$(LIB_LD_FLAGS) $(EXAMPLES_LD_FLAGS) $< $(LIBNAME).a -o $@
+
+
+ all: $(EXAMPLES_BINS)
+--- mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/pkgconfig.orig
2015-04-15 17:22:26.000000000 +0200
++++ mmm-e41eee502568d479c6483ecae7f554312ab4ad27/.mm/pkgconfig 2015-11-23
20:21:30.166007161 +0100
+@@ -6,7 +6,7 @@
+ @echo " gen" $@
+ @echo "prefix=$(PREFIX)" > $@
+ @echo exec_prefix=\$${prefix} >> $@
+- @echo libdir=\$${prefix}/lib >> $@
++ @echo "libdir=$(LIBDIR)" >> $@
+ @echo includedir=\$${prefix}/include >> $@
+ @echo apiversion=$(API_VERSION) >> $@
+ @echo >> $@
+--- mrg-b0cb507a366775a008cf083e1bcac07623d04ae2/Makefile.orig 2015-07-27
19:55:34.000000000 +0200
++++ mrg-b0cb507a366775a008cf083e1bcac07623d04ae2/Makefile 2015-11-23
21:23:14.215851520 +0100
+@@ -60,7 +60,7 @@
+
+ install: install-extra
+ install-extra:
+- install mrg-host mrg-terminal mrg-edit mrg-browser
$(DESTDIR)$(PREFIX)/bin/
++ cp -a mrg-host mrg-terminal mrg-edit mrg-browser
$(DESTDIR)$(PREFIX)/bin/
+
+ luajit/mrg_h.lua: lib/*.h Makefile
+ echo "local ffi = require'ffi'" > $@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mrg.git/commitdiff/298c0066fac2a5bea2e7e542be35d4cadceefaa7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
