From 64f9bb85245decaa8ba53f482e150558dcfb2265 Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Mon, 1 May 2023 15:39:49 -0500
Subject: [PATCH] Revert "Support for New Linux Build Server + glibc Wrapping"

---
 .gitlab-ci.yml   |  2 +-
 CMakeLists.txt   | 11 +++--------
 src/Fraction.cpp |  3 ---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad5c43e4..b3e2a6bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ linux-builder:
   except:
   - tags
   tags:
-    - linux-focal
+    - linux-bionic
 
 mac-builder:
   stage: build-libopenshot
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8f8aa96..19848cba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,22 +63,17 @@ option(ENABLE_IWYU "Enable 'Include What You Use' scanner (CMake 3.3+)" OFF)
 option(ENABLE_PARALLEL_CTEST "Run CTest using multiple processors" ON)
 option(VERBOSE_TESTS "Run CTest with maximum verbosity" OFF)
 option(ENABLE_COVERAGE "Scan test coverage using gcov and report" OFF)
+
 option(ENABLE_LIB_DOCS "Build API documentation (requires Doxygen)" ON)
+
 option(APPIMAGE_BUILD "Build to install in an AppImage (Linux only)" OFF)
+
 option(USE_SYSTEM_JSONCPP "Use system installed JsonCpp, if found" ON)
 option(DISABLE_BUNDLED_JSONCPP "Don't fall back to bundled JsonCpp" OFF)
 option(ENABLE_MAGICK "Use ImageMagick, if available" ON)
 option(ENABLE_OPENCV "Build with OpenCV algorithms (requires Boost, Protobuf 3)" ON)
 option(USE_HW_ACCEL "Enable hardware-accelerated encoding-decoding with FFmpeg 3.4+" ON)
 
-if (APPIMAGE_BUILD)
-  # Force older version of glibc and -pthread flag when building AppImage
-  # for better backwards compatibility (i.e older distros)
-  message("Wrapping libc for compatibility with version glibc_2.23")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include /usr/local/include/force_link_glibc_2.23.h -static-libgcc")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include /usr/local/include/force_link_glibc_2.23.h -static-libgcc")
-endif()
-
 # Legacy commandline override
 if (DISABLE_TESTS)
   set(BUILD_TESTING OFF)
diff --git a/src/Fraction.cpp b/src/Fraction.cpp
index dd8b40e9..da816494 100644
--- a/src/Fraction.cpp
+++ b/src/Fraction.cpp
@@ -65,9 +65,6 @@ int Fraction::GreatestCommonDenominator() {
 void Fraction::Reduce() {
 	// Get the greatest common denominator
 	int GCD = GreatestCommonDenominator();
-	if (GCD == 0) {
-	    return;
-	}
 
 	// Reduce this fraction to the smallest possible whole numbers
 	num = num / GCD;