Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 917678 Details for
Bug 1119134
gsmartcontrol bundles pcrecpp
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Use system pcrecpp
Use-system-pcrecpp-1119134.patch (text/plain), 6.18 KB, created by
Yaakov Selkowitz
on 2014-07-14 06:04:49 UTC
(
hide
)
Description:
Use system pcrecpp
Filename:
MIME Type:
Creator:
Yaakov Selkowitz
Created:
2014-07-14 06:04:49 UTC
Size:
6.18 KB
patch
obsolete
>From e2bdbd7e612d6e4cd99846e09d49fd4e062106fc Mon Sep 17 00:00:00 2001 >From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> >Date: Mon, 14 Jul 2014 01:04:15 -0500 >Subject: [PATCH] Use system pcrecpp (#1119134) > >--- > gsmartcontrol-0.8.7-system-pcrecpp.patch | 95 ++++++++++++++++++++++++++++++++ > gsmartcontrol.spec | 11 +++- > 2 files changed, 105 insertions(+), 1 deletion(-) > create mode 100644 gsmartcontrol-0.8.7-system-pcrecpp.patch > >diff --git a/gsmartcontrol-0.8.7-system-pcrecpp.patch b/gsmartcontrol-0.8.7-system-pcrecpp.patch >new file mode 100644 >index 0000000..f90f1af >--- /dev/null >+++ b/gsmartcontrol-0.8.7-system-pcrecpp.patch >@@ -0,0 +1,95 @@ >+--- origsrc/gsmartcontrol-0.8.7/configure.ac 2012-08-10 10:56:01.000000000 -0500 >++++ src/gsmartcontrol-0.8.7/configure.ac 2014-07-13 23:01:59.316743400 -0500 >+@@ -229,16 +229,16 @@ PCRE_CFLAGS=""; >+ PCRE_LIBS=""; >+ >+ # try pkg-config first >+-PKG_CHECK_MODULES(PCRE, [libpcre], [pcre_found=yes], [pcre_found=no]) >++PKG_CHECK_MODULES(PCRE, [libpcrecpp], [pcre_found=yes], [pcre_found=no]) >+ >+ # if not found, try pcre-config (solaris had it but not pkg-config). >+ if test "x$pcre_found" = "xno"; then >+ AC_PATH_PROG(pcre_config_binary, [pcre-config]) >+ if test "x$pcre_config_binary" != "x"; then >+ PCRE_CFLAGS="`pcre-config --cflags`" >+- PCRE_LIBS="`pcre-config --libs`" >++ PCRE_LIBS="`pcre-config --libs-cpp`" >+ else >+- # AC_MSG_ERROR([Could not find pcre through pkg-config and pcre-config. Make sure the pcre libraries are installed]) >++ # AC_MSG_ERROR([Could not find pcrecpp through pkg-config and pcre-config. Make sure the pcrecpp libraries are installed]) >+ AC_MSG_ERROR([$PCRE_PKG_ERRORS]) >+ fi >+ fi >+@@ -445,8 +445,7 @@ CXXFLAGS="$CXXFLAGS $ADDITIONAL_FLAGS" >+ # Add global configuration file. Note: It must be searched in top_builddir >+ # first (that's why -I is the first flag), for precompiled headers to work. >+ >+-# Add pcrecpp too, because its files use #<file> on each other. >+-ADDITIONAL_INCLUDES="-I\$(top_builddir) -I\$(top_srcdir)/src -I\$(top_srcdir)/src/pcrecpp" >++ADDITIONAL_INCLUDES="-I\$(top_builddir) -I\$(top_srcdir)/src" >+ >+ # -include works with gcc, intel, pathscale and sunstudio since 12u1, but doesn't work >+ # with pgi and older sunstudio (the one in solaris10, for example). >+@@ -542,7 +541,7 @@ AC_CONFIG_FILES([data/gsmartcontrol-root >+ # these are all the makefiles to generate >+ >+ AC_CONFIG_FILES([Makefile src/Makefile src/applib/Makefile src/res/Makefile src/hz/Makefile \ >+- src/libdebug/Makefile src/pcrecpp/Makefile src/rconfig/Makefile src/rmn/Makefile \ >++ src/libdebug/Makefile src/rconfig/Makefile src/rmn/Makefile \ >+ data/Makefile data/16/Makefile data/22/Makefile data/24/Makefile data/32/Makefile \ >+ data/48/Makefile data/64/Makefile data/128/Makefile data/256/Makefile data/nsis/Makefile \ >+ debian.dist/Makefile]) >+--- origsrc/gsmartcontrol-0.8.7/src/Makefile.am 2011-11-20 04:05:38.000000000 -0600 >++++ src/gsmartcontrol-0.8.7/src/Makefile.am 2014-07-13 22:59:08.646828300 -0500 >+@@ -1,7 +1,7 @@ >+ AM_CPPFLAGS = $(all_includes) >+ METASOURCES = AUTO >+ >+-SUBDIRS = libdebug hz rmn rconfig pcrecpp applib res >++SUBDIRS = libdebug hz rmn rconfig applib res >+ >+ >+ if TARGET_OS_KERNEL_FAMILY_WINDOWS >+@@ -27,7 +27,7 @@ noinst_DATA = gsc_winres.rc.in gsmartcon >+ bin_PROGRAMS = gsmartcontrol >+ >+ gsmartcontrol_LDADD = $(top_builddir)/src/applib/libapplib.a \ >+- $(top_builddir)/src/pcrecpp/libpcrecpp.a $(top_builddir)/src/libdebug/libdebug.a \ >++ $(top_builddir)/src/libdebug/libdebug.a \ >+ $(top_builddir)/src/res/libres.a $(WINRES_OBJ) >+ >+ noinst_HEADERS = global_macros.h gsc_about_dialog.h gsc_add_device_window.h gsc_executor_error_dialog.h \ >+--- origsrc/gsmartcontrol-0.8.7/src/applib/Makefile.am 2011-11-20 04:05:38.000000000 -0600 >++++ src/gsmartcontrol-0.8.7/src/applib/Makefile.am 2014-07-13 23:03:13.334916400 -0500 >+@@ -26,16 +26,16 @@ smartctl_executor_test_LDADD = libapplib >+ >+ smartctl_parser_test_SOURCES = smartctl_parser_test.cpp >+ smartctl_parser_test_LDADD = libapplib.a \ >+- $(top_builddir)/src/pcrecpp/libpcrecpp.a $(top_builddir)/src/libdebug/libdebug.a >++ $(top_builddir)/src/libdebug/libdebug.a >+ >+ storage_detector_test_SOURCES = storage_detector_test.cpp >+ storage_detector_test_LDADD = libapplib.a \ >+- $(top_builddir)/src/pcrecpp/libpcrecpp.a $(top_builddir)/src/libdebug/libdebug.a >++ $(top_builddir)/src/libdebug/libdebug.a >+ >+ spawn_test_SOURCES = spawn_test.cpp >+ >+ # Build them first >+-SUBDIRS=../libdebug ../pcrecpp >++SUBDIRS=../libdebug >+ >+ >+ # we don't list them in a separate variable because otherwise kdevelop won't see them. >+--- origsrc/gsmartcontrol-0.8.7/src/applib/app_pcrecpp.h 2012-01-11 10:57:58.000000000 -0600 >++++ src/gsmartcontrol-0.8.7/src/applib/app_pcrecpp.h 2014-07-13 23:03:46.057033100 -0500 >+@@ -20,8 +20,7 @@ >+ #endif >+ >+ >+-#include "pcrecpp/pcrecpp_internal.h" >+-#include "pcrecpp/pcrecpp.h" >++#include <pcrecpp.h> >+ >+ #include <string> >+ #include "hz/debug.h" >diff --git a/gsmartcontrol.spec b/gsmartcontrol.spec >index 1d20cf2..a9e2077 100644 >--- a/gsmartcontrol.spec >+++ b/gsmartcontrol.spec >@@ -2,7 +2,7 @@ > > Name: gsmartcontrol > Version: 0.8.7 >-Release: 5%{?dist} >+Release: 6%{?dist} > Summary: Graphical user interface for smartctl > Group: Applications/System > >@@ -19,7 +19,10 @@ Requires: usermode > # Patch man page and .desktop file to drop references to gsmartcontrol-root, > # as Fedora uses console-helper instead. > Patch0: gsmartcontrol-0.8.7-console-helper.patch >+# Avoid bundled pcrecpp >+Patch1: gsmartcontrol-0.8.7-system-pcrecpp.patch > >+BuildRequires: autoconf automake > BuildRequires: gtkmm24-devel pcre-devel desktop-file-utils > > %description >@@ -32,6 +35,9 @@ data to determine its health, as well as run various tests on it. > %prep > %setup -q > %patch -P 0 -p1 -b .console-helper >+%patch1 -p2 -b .system-pcrecpp >+rm -f src/pcrecpp/* >+autoreconf -fiv > > %build > %configure --docdir=%{_pkgdocdir} >@@ -96,6 +102,9 @@ fi > %config(noreplace) %{_sysconfdir}/security/console.apps/%{name} > > %changelog >+* Mon Jul 14 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.8.7-6 >+- Use system pcrecpp (#1119134) >+ > * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.7-5 > - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild > >-- >1.9.3
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1119134
: 917678