summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fpc-docs-svn/.gitignore1
-rw-r--r--fpc-docs-svn/PKGBUILD62
-rw-r--r--fpc-src-svn/.gitignore1
-rw-r--r--fpc-src-svn/PKGBUILD53
-rw-r--r--fpc-svn/.gitignore1
-rw-r--r--fpc-svn/38680_refined_htypechk.pas-2.patch195
-rw-r--r--fpc-svn/PKGBUILD106
7 files changed, 0 insertions, 419 deletions
diff --git a/fpc-docs-svn/.gitignore b/fpc-docs-svn/.gitignore
deleted file mode 100644
index dfcaa10d3..000000000
--- a/fpc-docs-svn/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-documentation
diff --git a/fpc-docs-svn/PKGBUILD b/fpc-docs-svn/PKGBUILD
deleted file mode 100644
index 1c9783a64..000000000
--- a/fpc-docs-svn/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Maintainer: Erich Eckner <arch at eckner dot net>
-# Contributor: L <alaviss 0 at gmail dot com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
-# Contributor: Jan Willemson <janwil@hot.ee>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
-# Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org>
-# See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc
-
-pkgname='fpc-docs-svn'
-pkgver=2.6.0.r1159.00815ad0
-_pkgver="${pkgver%.r*}"
-_commit="${pkgver##*.}"
-pkgrel=1
-arch=('any')
-url='http://www.freepascal.org/'
-license=('GPL' 'LGPL' 'custom')
-pkgdesc='Documentation for the Free Pascal Compiler'
-options=('!strip')
-makedepends=('subversion'
- 'texlive-core' 'texlive-htmlxml'
- 'texlive-latexextra' 'ghostscript' 'fpc-src-svn' 'fpc-svn')
-source=('git+https://gitlab.com/freepascal.org/fpc/documentation.git#commit='"${_commit}")
-sha512sums=('SKIP')
-
-pkgver() {
- cd "${srcdir}"/documentation
- last_version=$(
- git tag \
- | sed '
- s@^release_\([0-9_]\+\)$@\1@
- t
- d
- ' \
- | tr '_' '.' \
- | sort -V \
- | tail -n1
- )
- _commit=$(
- git rev-parse "${_commit}" \
- | cut -c1-8
- )
- revision=$(
- git rev-list --count "${_commit}" "^release_${last_version//./_}"
- )
- printf '%s.r%s.%s' \
- "${last_version}" \
- "${revision}" \
- "${_commit}"
-}
-
-build() {
- cd "${srcdir}"/documentation
- cp -r /usr/lib/fpc/src ../fpcsrc
- make -j1 FPCSRCDIR="${srcdir}"/fpcsrc html
-}
-
-package() {
- cd "${srcdir}"/documentation
- make PREFIX="${pkgdir}"/usr htmlinstall
-}
diff --git a/fpc-src-svn/.gitignore b/fpc-src-svn/.gitignore
deleted file mode 100644
index 5a18cd2fb..000000000
--- a/fpc-src-svn/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-source
diff --git a/fpc-src-svn/PKGBUILD b/fpc-src-svn/PKGBUILD
deleted file mode 100644
index 3f3fb13a5..000000000
--- a/fpc-src-svn/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: Erich Eckner <arch at eckner dot net>
-# Contributor: L <alaviss 0 at gmail dot com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
-# Contributor: Jan Willemson <janwil@hot.ee>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
-# Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org>
-# See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc
-
-pkgname='fpc-src-svn'
-pkgver=3.3.1.r15754.5bdef935
-_pkgver="${pkgver%.r*}"
-_commit="${pkgver##*.}"
-pkgrel=1
-arch=('i486' 'i686' 'pentium4' 'x86_64')
-url='http://www.freepascal.org/'
-license=('GPL' 'LGPL' 'custom')
-depends=()
-makedepends=('git')
-pkgdesc='Sources for the Free Pascal Compiler (required by the Lazarus IDE)'
-options=('!strip')
-conflicts=('fpc-src')
-provides=("fpc-src=${pkgver}")
-
-source=('git+https://gitlab.com/freepascal.org/fpc/source.git#commit='"${_commit}")
-sha512sums=('03158b365a62f001dbfc7af5286bde227096d9672dab82f76f7c8724e04a2f952f827690c8b1c9fca948cb15b3bf4b46b20ed91252b0aacf80546e02e1d018d4')
-
-pkgver() {
- cd "${srcdir}"/source
- last_version=$(
- git tag \
- | grep '^[0-9.]\+$' \
- | sort -V \
- | tail -n1
- )
- _commit=$(
- git rev-parse "${_commit}" \
- | cut -c1-8
- )
- revision=$(
- git rev-list --count "${_commit}" "^${last_version}"
- )
- printf '%s.r%s.%s' \
- "${last_version}" \
- "${revision}" \
- "${_commit}"
-}
-
-package() {
- install -dm755 "${pkgdir}"/usr/lib/fpc/src
- mv "${srcdir}"/source/* "${pkgdir}"/usr/lib/fpc/src/
-}
diff --git a/fpc-svn/.gitignore b/fpc-svn/.gitignore
deleted file mode 100644
index 78120a701..000000000
--- a/fpc-svn/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-fpcbuild
diff --git a/fpc-svn/38680_refined_htypechk.pas-2.patch b/fpc-svn/38680_refined_htypechk.pas-2.patch
deleted file mode 100644
index e859cddd6..000000000
--- a/fpc-svn/38680_refined_htypechk.pas-2.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-Index: compiler/htypechk.pas
-===================================================================
---- compiler/htypechk.pas (리비전 49131)
-+++ compiler/htypechk.pas (작업 사본)
-@@ -2892,11 +2892,15 @@
- obj_to : tobjectdef;
- def_from,
- def_to : tdef;
-+ tempn,
- currpt,
- pt : tcallparanode;
-+ eqtemp,
- eq,
- mineq : tequaltype;
-+ nconvtyp,
- convtype : tconverttype;
-+ npd,
- pdtemp,
- pdoper : tprocdef;
- releasecurrpt : boolean;
-@@ -3001,7 +3005,10 @@
- is_integer(def_to) and
- is_in_limit(def_from,def_to) then
- begin
-- eq:=te_equal;
-+ if torddef(def_from).ordtype=torddef(def_to).ordtype then
-+ eq:=te_exact
-+ else
-+ eq:=te_equal;
- hp^.ordinal_distance:=hp^.ordinal_distance+
- abs(bestreal(torddef(def_from).low)-bestreal(torddef(def_to).low));
- rth:=bestreal(torddef(def_to).high);
-@@ -3023,7 +3030,10 @@
- is_real_or_cextended(def_from) and
- is_real_or_cextended(def_to) then
- begin
-- eq:=te_equal;
-+ if tfloatdef(def_from).floattype=tfloatdef(def_to).floattype then
-+ eq:=te_exact
-+ else
-+ eq:=te_equal;
- if is_extended(def_to) then
- rth:=4
- else
-@@ -3130,6 +3140,30 @@
- para_allowed(eq,currpt,def_to);
- end;
- end;
-+ { to specialize pointer }
-+ if (eq<te_exact) and
-+ is_pointer(def_from) and is_pointer(def_to) and
-+ (tstoreddef(tpointerdef(def_to).pointeddef).is_specialization) then
-+ begin
-+ eqtemp:=compare_defs_ext(tpointerdef(def_from).pointeddef,tpointerdef(def_to).pointeddef,nothingn,nconvtyp,npd,[cdo_equal_check]);
-+ if eqtemp<>te_exact then
-+ { void pointer }
-+ if currpt.left.nodetype=addrn then
-+ begin
-+ tempn:=tcallparanode(currpt.left);
-+ while assigned(tempn) do
-+ begin
-+ if tempn.nodetype in [loadn,derefn] then
-+ begin
-+ eqtemp:=compare_defs_ext(tempn.resultdef,tpointerdef(def_to).pointeddef,nothingn,nconvtyp,npd,[cdo_equal_check]);
-+ break;
-+ end;
-+ tempn:=tcallparanode(tempn.left);
-+ end;
-+ end;
-+ if eqtemp=te_exact then
-+ eq:=te_exact;
-+ end;
-
- { univ parameters match if the size matches (don't override the
- comparison result if it was ok, since a match based on the
-@@ -3145,7 +3179,6 @@
- procvar is choosen. See tb0471 (PFV) }
- if (pt<>currpt) and (eq=te_exact) then
- eq:=te_equal;
--
- { increase correct counter }
- case eq of
- te_exact :
-@@ -3291,53 +3324,53 @@
- res:=(bestpd^.coper_count-currpd^.coper_count);
- if (res=0) then
- begin
-- { less cl6 parameters? }
-- res:=(bestpd^.cl6_count-currpd^.cl6_count);
-- if (res=0) then
-- begin
-- { less cl5 parameters? }
-- res:=(bestpd^.cl5_count-currpd^.cl5_count);
-- if (res=0) then
-- begin
-- { less cl4 parameters? }
-- res:=(bestpd^.cl4_count-currpd^.cl4_count);
-+ { more exact parameters? }
-+ res:=(currpd^.exact_count-bestpd^.exact_count);
-+ if (res=0) then
-+ begin
-+ { less cl6 parameters? }
-+ res:=(bestpd^.cl6_count-currpd^.cl6_count);
-+ if (res=0) then
-+ begin
-+ { less cl5 parameters? }
-+ res:=(bestpd^.cl5_count-currpd^.cl5_count);
- if (res=0) then
- begin
-- { less cl3 parameters? }
-- res:=(bestpd^.cl3_count-currpd^.cl3_count);
-+ { less cl4 parameters? }
-+ res:=(bestpd^.cl4_count-currpd^.cl4_count);
- if (res=0) then
- begin
-- { less cl2 parameters? }
-- res:=(bestpd^.cl2_count-currpd^.cl2_count);
-- if (res=0) then
-- begin
-- { less cl1 parameters? }
-- res:=(bestpd^.cl1_count-currpd^.cl1_count);
-- if (res=0) then
-- begin
-- { more exact parameters? }
-- res:=(currpd^.exact_count-bestpd^.exact_count);
-- if (res=0) then
-- begin
-- { less equal parameters? }
-- res:=(bestpd^.equal_count-currpd^.equal_count);
-- if (res=0) then
-- begin
-- { smaller ordinal distance? }
-- if (currpd^.ordinal_distance<bestpd^.ordinal_distance) then
-- res:=1
-- else
-- if (currpd^.ordinal_distance>bestpd^.ordinal_distance) then
-- res:=-1
-- else
-- res:=0;
-- end;
-- end;
-- end;
-- end;
-+ { less cl3 parameters? }
-+ res:=(bestpd^.cl3_count-currpd^.cl3_count);
-+ if (res=0) then
-+ begin
-+ { less cl2 parameters? }
-+ res:=(bestpd^.cl2_count-currpd^.cl2_count);
-+ if (res=0) then
-+ begin
-+ { less cl1 parameters? }
-+ res:=(bestpd^.cl1_count-currpd^.cl1_count);
-+ if (res=0) then
-+ begin
-+ { less equal parameters? }
-+ res:=(bestpd^.equal_count-currpd^.equal_count);
-+ if (res=0) then
-+ begin
-+ { smaller ordinal distance? }
-+ if (currpd^.ordinal_distance<bestpd^.ordinal_distance) then
-+ res:=1
-+ else
-+ if (currpd^.ordinal_distance>bestpd^.ordinal_distance) then
-+ res:=-1
-+ else
-+ res:=0;
-+ end;
-+ end;
-+ end;
-+ end;
- end;
- end;
-- end;
-+ end;
- end;
- end;
- end;
-@@ -3608,7 +3641,7 @@
- cpoptions:=cpoptions+[cpo_rtlproc];
-
- compare_by_old_sortout_check := 0; // can't decide, bestpd probably wasn't sorted out in unpatched
-- if (compare_paras(pd^.data.paras,bestpd^.data.paras,cp_value_equal_const,cpoptions)>=te_equal) and
-+ if (compare_paras(pd^.data.paras,bestpd^.data.paras,cp_value_equal_const,cpoptions)>te_equal) and
- (not(po_objc in bestpd^.data.procoptions) or (bestpd^.data.messageinf.str^=pd^.data.messageinf.str^)) then
- compare_by_old_sortout_check := 1; // bestpd was sorted out before patch
- end;
-@@ -3643,7 +3676,6 @@
- end;
- end;
-
--
- function tcallcandidates.choose_best(var bestpd:tabstractprocdef; singlevariant: boolean):integer;
- var
- pd: tprocdef;
diff --git a/fpc-svn/PKGBUILD b/fpc-svn/PKGBUILD
deleted file mode 100644
index 75789e77f..000000000
--- a/fpc-svn/PKGBUILD
+++ /dev/null
@@ -1,106 +0,0 @@
-# Maintainer: Erich Eckner <arch at eckner dot net>
-# Contributor: L <alaviss 0 at gmail dot com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
-# Contributor: Jan Willemson <janwil@hot.ee>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
-# Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org>
-# See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc
-
-pkgname='fpc-svn'
-pkgver=3.3.1.r12451.c29018d0
-_pkgver="${pkgver%.r*}"
-_revision="${pkgver##*.r}"
-pkgrel=1
-arch=('i486' 'i686' 'pentium4' 'x86_64')
-url='http://www.freepascal.org/'
-license=('GPL' 'LGPL' 'custom')
-depends=('bash' 'ncurses' 'zlib' 'expat')
-# Trunk can only be built with stable version of FPC
-makedepends=('fpc' 'subversion' 'fpc-src-svn')
-source=()
-pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible Pascal Compiler. It comes with fully TP 7.0 compatible run-time library."
-
-pkgver() {
- {
- pacman -Q fpc-src-svn 2>/dev/null \
- || {
- pacman -Ss fpc-src-svn \
- | sed '
- s@^\S\+/\(fpc-src-svn\s\+\)@\1@
- t
- d
- '
- }
- } \
- | sed '
- s@^.* @@
- s@-.*$@@
- '
-}
-
-prepare() {
- cd "${srcdir}"
- mkdir -p "fpcbuild/.makepkg"
- svn checkout -r HEAD --ignore-externals --config-dir "fpcbuild/.makepkg" "http://svn.freepascal.org/svn/fpcbuild/trunk" "fpcbuild"
-}
-
-build() {
- cd "${srcdir}"/fpcbuild
- cp -r /usr/lib/fpc/src fpcsrc
- pushd fpcsrc/compiler
- fpcmake -Tall
- popd
- make NOGDB=1 OPT=' -dRelease' build
-}
-
-package() {
- backup=('etc/fpc.cfg')
- options=('staticlibs')
- conflicts=('fpc')
- provides=("fpc=${pkgver}")
- local _pinned_dependencies
- _pinned_dependencies=(
- 'glibc>=2.31'
- )
- depends+=("${_pinned_dependencies[@]}")
-
- cd "${srcdir}"/fpcbuild
-
- export HOME="${srcdir}"
-
- make -j1 PREFIX="${pkgdir}"/usr NOGDB=1 OPT=' -dRelease' install
- export PATH="${pkgdir}/usr/bin:${PATH}"
-
- install -Dm644 fpcsrc/rtl/COPYING.FPC \
- "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING.FPC
-
- local _fpcarch=''
- case "$CARCH" in
- 'i486'|'i686'|'pentium4')
- _fpcarch='386'
- ;;
- 'x86_64')
- _fpcarch='x64'
- ;;
- *)
- error 'Unsupported $CARCH'
- return 1
- ;;
- esac
- ln -s /usr/lib/fpc/${_pkgver}/ppc${_fpcarch} "${pkgdir}"/usr/bin/
- unset _fpcarch
-
- install -dm755 "${pkgdir}"/etc
- "${pkgdir}"/usr/lib/fpc/${_pkgver}/samplecfg \
- "${pkgdir}"/usr/lib/fpc/${_pkgver} "${pkgdir}"/etc
-
- # use -fPIC by default
- echo -e '#ifdef cpux86_64\n# for x86_64 use -fPIC by default\n-Cg\n#endif' \
- >> "${pkgdir}"/etc/fpc.cfg
-
- mv "${pkgdir}"/usr/man "${pkgdir}"/usr/share/
-
- find "${pkgdir}"/etc -type f -exec sed -i "s|${pkgdir}||g" {} \;
-}