.gear/rules | 2 ++ .gear/tags/list | 1 + .gear/upstream/remotes | 3 +++ Makefile | 6 ++--- horizon.spec | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/logger/logger.hpp | 1 + 6 files changed, 73 insertions(+), 4 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 00000000..4b0460ca --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: v@version@:. +diff: v@version@:. . diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 00000000..137ba277 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +4571e56acc4d3099ab182ca85a575237593b980e v2.2.0 diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes new file mode 100644 index 00000000..b32d4b06 --- /dev/null +++ b/.gear/upstream/remotes @@ -0,0 +1,3 @@ +[remote "upstream"] + url = https://github.com/horizon-eda/horizon + fetch = +refs/heads/*:refs/remotes/upstream/* diff --git a/Makefile b/Makefile index 99f9b156..3ad6bb54 100644 --- a/Makefile +++ b/Makefile @@ -823,13 +823,13 @@ LIBS_COMMON = sqlite3 libzip ifneq ($(OS),Windows_NT) LIBS_COMMON += uuid endif -LIBS_ALL = $(LIBS_COMMON) gtkmm-3.0 epoxy cairomm-pdf-1.0 librsvg-2.0 libzmq libgit2 libcurl glm libpng +LIBS_ALL = $(LIBS_COMMON) gtkmm-3.0 epoxy cairomm-pdf-1.0 librsvg-2.0 libzmq libgit2 libcurl libpng OPTIMIZE = -fdata-sections -ffunction-sections -O3 DEBUGFLAGS = -g3 WARNFLAGS = -Wall -Wshadow PKG_CONFIG_LIBS := $(shell $(PKG_CONFIG) --cflags $(LIBS_ALL)) -CXXFLAGS += $(DEBUGFLAGS) $(DEFINES) $(OPTIMIZE) $(PKG_CONFIG_LIBS) -MP -MD -pthread $(WARNFLAGS) -std=c++17 +CXXFLAGS += $(DEBUGFLAGS) $(DEFINES) $(OPTIMIZE) $(PKG_CONFIG_LIBS) -I/usr/include/glm -MP -MD -pthread $(WARNFLAGS) -std=c++17 CFLAGS = $(filter-out -Wsuggest-override, $(filter-out -std=%,$(CXXFLAGS))) -std=c99 LDFLAGS += -lm -lpthread -lstdc++ GLIB_COMPILE_RESOURCES := $(shell $(PKG_CONFIG) --variable=glib_compile_resources gio-2.0) @@ -847,8 +847,6 @@ else UNAME := $(shell uname) ifeq ($(UNAME), FreeBSD) CXXFLAGS += -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR - else - LDFLAGS += -lstdc++fs endif ifeq ($(UNAME), Darwin) # do nothing on mac os diff --git a/horizon.spec b/horizon.spec new file mode 100644 index 00000000..31edc651 --- /dev/null +++ b/horizon.spec @@ -0,0 +1,64 @@ +Name: horizon +Version: 2.2.0 +Release: alt2 + +Summary: Horizon is a free EDA package +License: GPL-3.0 +Group: Engineering +Url: https://github.com/horizon-eda/horizon + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: gcc-c++ libgtkmm3-devel +BuildRequires: libsqlite3-devel +BuildRequires: libzip-devel +BuildRequires: libuuid-devel +BuildRequires: libepoxy-devel +BuildRequires: librsvg-devel +BuildRequires: libpodofo-devel +BuildRequires: libzeromq-cpp-devel +BuildRequires: libgit2-devel +BuildRequires: libcurl-devel +BuildRequires: libglm-devel +BuildRequires: boost-devel-headers +BuildRequires: opencascade-devel + +%description +%summary + +%prep +%setup +%autopatch -p1 + +%build +#configure +%make_build + +%install +%makeinstall_std PREFIX=%prefix + +%files +%_bindir/* +%_desktopdir/* +%_iconsdir/hicolor/*/apps/* +%_datadir/metainfo/* +%doc *.md + +%changelog +* Mon Jun 26 2023 Anton Midyukov 2.2.0-alt2 +- fix build with gcc13 +- cleanup Packager +- patch from git diff + +* Fri Apr 15 2022 Andrey Cherepanov 2.2.0-alt1 +- NMU: new version for opencascade-7.1.0 + +* Wed Dec 29 2021 Anton Midyukov 1.1.1-alt2 +- fix build without glm.pc (thanks aris@) + +* Mon May 03 2021 Andrey Cherepanov 1.1.1-alt1.1 +- NMU: rebuild with opencascade-devel + +* Tue May 12 2020 Anton Midyukov 1.1.1-alt1 +- Initial build for Sisyphus diff --git a/src/logger/logger.hpp b/src/logger/logger.hpp index f7483cb7..e0dbfeeb 100644 --- a/src/logger/logger.hpp +++ b/src/logger/logger.hpp @@ -2,6 +2,7 @@ #include #include #include +#include #include namespace horizon {